good

diff --git a/requests/compat.py b/requests/compat.py
index bf10172..1db7cb0 100644 (file)
--- a/requests/compat.py
+++ b/requests/compat.py
@@ -73,3 +73,19 @@ is_hpux = ('hpux' in str(sys.platform).lower())   # Complete guess.
 is_solaris = ('solar==' in str(sys.platform).lower())   # Complete guess.
 
 
+# ---------
+# Specifics
+# ---------
+
+
+if is_py2:
+    from urlparse import urlparse, urlunparse, urljoin, urlsplit, quote, unquote
+    from urllib2 import parse_http_list
+    import cookielib
+
+
+elif is_py3:
+    from urllib.parse import urlparse, urlunparse, urljoin, urlsplit, urlencode, quote, unquote
+    from urllib.request import parse_http_list
+    from http import cookiejar as cookielib
+

diff --git a/requests/utils.py b/requests/utils.py
index 673b46f..5acc9b2 100644 (file)
--- a/requests/utils.py
+++ b/requests/utils.py
@@ -11,19 +11,13 @@ that are also useful for external consumption.
 
 import cgi
 import codecs
-# import cookielib
-from http import cookiejar as cookielib
 import os
 import random
 import re
 import zlib
-import urllib.request, urllib.parse, urllib.error
 
-
-from urllib.parse import quote, unquote
-
-# from urllib2 import parse_http_list as _parse_list_header
-from urllib.request import parse_http_list as _parse_list_header
+from .compat import parse_http_list as _parse_list_header
+from .compat import quote, unquote, cookielib
 
 from http.cookies import SimpleCookie