Python compatible url* imports

sebastinas · sebastinas · commit eeb2b8953ea1 · 2015-02-04T17:33:06.000+01:00
Signed-off-by: Sebastian Ramacher &lt;sebastian+dev@ramacher.at&gt;
diff --git a/bpython/repl.py b/bpython/repl.py
@@ -40,8 +40,6 @@
 from itertools import takewhile
 from locale import getpreferredencoding
 from string import Template
-from urllib import quote as urlquote
-from urlparse import urlparse, urljoin
 
 from pygments.token import Token
 
@@ -54,6 +52,15 @@
 import bpython.autocomplete as autocomplete
 
 
+try:
+    from urllib.parse import quote as urlquote
+    from urllib.parse import urljoin
+    from urllib.parse import urlparse
+except ImportError:
+    from urllib import quote as urlquote
+    from urlparse import urlparse, urljoin
+
+
 class RuntimeTimer(object):
     def __init__(self):
         self.reset_timer()
