diff options
| -rw-r--r-- | setuptools.egg-info/requires.txt | 12 | ||||
| -rwxr-xr-x | setuptools/command/install_egg_info.py | 1 | ||||
| -rw-r--r-- | setuptools/compat.py | 4 | ||||
| -rwxr-xr-x | setuptools/sandbox.py | 1 | ||||
| -rw-r--r-- | setuptools/tests/test_sdist.py | 2 |
5 files changed, 9 insertions, 11 deletions
diff --git a/setuptools.egg-info/requires.txt b/setuptools.egg-info/requires.txt index c06a8a0b..e4fb4954 100644 --- a/setuptools.egg-info/requires.txt +++ b/setuptools.egg-info/requires.txt @@ -1,13 +1,13 @@ -[ssl:sys_platform=='win32'] -wincertstore==0.1 - [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'] +wincertstore==0.1 [certs] -certifi==0.0.8
\ No newline at end of file +certifi==0.0.8 + +[ssl:python_version in '2.4, 2.5'] +ssl==1.16
\ No newline at end of file diff --git a/setuptools/command/install_egg_info.py b/setuptools/command/install_egg_info.py index 87ddff9c..f44b34b5 100755 --- a/setuptools/command/install_egg_info.py +++ b/setuptools/command/install_egg_info.py @@ -1,6 +1,5 @@ from setuptools import Command from setuptools.archive_util import unpack_archive -from setuptools.compat import PY3 from distutils import log, dir_util import os, shutil, pkg_resources diff --git a/setuptools/compat.py b/setuptools/compat.py index 437fb710..e2f64de2 100644 --- a/setuptools/compat.py +++ b/setuptools/compat.py @@ -26,7 +26,7 @@ if sys.version_info[0] < 3: reduce = reduce unichr = unichr unicode = unicode - from urllib import url2pathname, quote # Python 2.4 has no quote in urllib2 + from urllib import url2pathname import urllib2 from urllib2 import urlopen, HTTPError, URLError, unquote, splituser from urlparse import urlparse, urlunparse, urljoin @@ -72,7 +72,7 @@ else: from urllib.error import HTTPError, URLError import urllib.request as urllib2 from urllib.request import urlopen, url2pathname - from urllib.parse import urlparse, urlunparse, quote, unquote, splituser, urljoin + from urllib.parse import urlparse, urlunparse, unquote, splituser, urljoin xrange = range filterfalse = itertools.filterfalse diff --git a/setuptools/sandbox.py b/setuptools/sandbox.py index 91dfc519..4e527446 100755 --- a/setuptools/sandbox.py +++ b/setuptools/sandbox.py @@ -9,7 +9,6 @@ except NameError: _file = None _open = open from distutils.errors import DistutilsError -from setuptools.compat import builtins, execfile, reduce from pkg_resources import working_set from setuptools.compat import builtins, execfile, reduce diff --git a/setuptools/tests/test_sdist.py b/setuptools/tests/test_sdist.py index a58b749c..b8f89e06 100644 --- a/setuptools/tests/test_sdist.py +++ b/setuptools/tests/test_sdist.py @@ -10,7 +10,7 @@ import unittest import unicodedata -from setuptools.compat import StringIO, quote, unicode +from setuptools.compat import StringIO, unicode from setuptools.command.sdist import sdist from setuptools.command.egg_info import manifest_maker from setuptools.dist import Distribution |