Merge branch 'master' into pr/539

AUTHORS

@@ -44,3 +44,4 @@
 * han semaj <sangho.nah@gmail.com>
 * kirbyfan64 <kirbyfan64@users.noreply.github.com>
 * Brendan Curran-Johnson <brendan@bcjbcj.ca>
+* Ivan Kozik <ivan@ludios.org>

eg/lxml/parse-tumblr.hy

@@ -2,10 +2,13 @@
 ;;; Copyright (c) Paul R. Tagliamonte, 2013, MIT/Expat license.
 
 
-(import [urllib2 [urlopen]]
-        [lxml [etree]]
+(import [lxml [etree]]
         [sys [argv]])
 
+(try
+  (import [urllib.request [urlopen]])
+  (catch [ImportError]
+    (import [urllib2 [urlopen]])))
 
 (defn get-rss-feed-name [tumblr]
   (kwapply (.format "http://{tumblr}.tumblr.com/rss") {"tumblr" tumblr}))

setup.py

@@ -88,6 +88,7 @@ setup(
         "Programming Language :: Python :: 3",
         "Programming Language :: Python :: 3.2",
         "Programming Language :: Python :: 3.3",
+        "Programming Language :: Python :: 3.4",
         "Topic :: Software Development :: Code Generators",
         "Topic :: Software Development :: Compilers",
         "Topic :: Software Development :: Libraries",