Commits

Vinay Sajip  committed 9c8b09c

Tidied up imports.

  • Participants
  • Parent commits 480a7ce
  • Branches single-codebase

Comments (0)

Files changed (3)

File setuptools.egg-info/requires.txt

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

File setuptools/ssl_support.py

 from setuptools.compat import urllib2
 
 try:
-    import urllib2
-except ImportError:
-    import urllib.request as urllib2
-
-try:
     import ssl
 except ImportError:
     ssl = None

File setuptools/tests/test_sdist.py

 import unittest
 import unicodedata
 
-
 from setuptools.compat import StringIO, unicode
 from setuptools.command.sdist import sdist
 from setuptools.command.egg_info import manifest_maker
 
 # 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, '/')