Tidied up imports.

--HG--
branch : single-codebase

setuptools.egg-info/requires.txt

 
 
-[ssl:python_version in '2.4, 2.5']
-ssl==1.16
-
 [ssl:sys_platform=='win32' and python_version=='2.4']
 ctypes==1.0.2
 
+[ssl:python_version in '2.4, 2.5']
+ssl==1.16
+
 [certs]
 certifi==0.0.8
 

setuptools/ssl_support.py

@@ -3,11 +3,6 @@ import pkg_resources
 from pkg_resources import ResolutionError, ExtractionError
 from setuptools.compat import urllib2
 
-try:
-    import urllib2
-except ImportError:
-    import urllib.request as urllib2
-
 try:
     import ssl
 except ImportError:

setuptools/tests/test_sdist.py

@@ -9,7 +9,6 @@ import tempfile
 import unittest
 import unicodedata
 
-
 from setuptools.compat import StringIO, unicode
 from setuptools.command.sdist import sdist
 from setuptools.command.egg_info import manifest_maker
@@ -56,7 +55,7 @@ def b(s, encoding='utf-8'):
 
 # Convert to POSIX path
 def posix(path):
-    if sys.version_info >= (3,) and not isinstance(path, unicode):
+    if sys.version_info >= (3,) and not isinstance(path, str):
         return path.replace(os.sep.encode('ascii'), b('/'))
     else:
         return path.replace(os.sep, '/')