diff options
| -rw-r--r-- | setuptools.egg-info/requires.txt | 6 | ||||
| -rw-r--r-- | setuptools/ssl_support.py | 5 | ||||
| -rw-r--r-- | setuptools/tests/test_sdist.py | 3 |
3 files changed, 4 insertions, 10 deletions
diff --git a/setuptools.egg-info/requires.txt b/setuptools.egg-info/requires.txt index 221040f8..0b577c97 100644 --- a/setuptools.egg-info/requires.txt +++ b/setuptools.egg-info/requires.txt @@ -1,11 +1,11 @@ -[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 diff --git a/setuptools/ssl_support.py b/setuptools/ssl_support.py index e749b312..2aec655a 100644 --- a/setuptools/ssl_support.py +++ b/setuptools/ssl_support.py @@ -4,11 +4,6 @@ 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: ssl = None diff --git a/setuptools/tests/test_sdist.py b/setuptools/tests/test_sdist.py index b8f89e06..438f7ced 100644 --- a/setuptools/tests/test_sdist.py +++ b/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, '/') |