Use six.moves.urllib_parse

sebastinas · sebastinas · commit df0ee5aa2adb · 2015-02-04T19:59:12.000+01:00
diff --git a/bpython/repl.py b/bpython/repl.py
@@ -41,6 +41,7 @@
 from locale import getpreferredencoding
 from string import Template
 from six import itervalues
+from six.moves.urllib_parse import quote as urlquote, urljoin, urlparse
 
 from pygments.token import Token
 
@@ -53,15 +54,6 @@
 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()
