diff options
| -rw-r--r-- | .hgtags | 3 | ||||
| -rw-r--r-- | CHANGES.txt | 26 | ||||
| -rw-r--r-- | ez_setup.py | 2 | ||||
| -rw-r--r-- | setuptools.egg-info/entry_points.txt | 82 | ||||
| -rw-r--r-- | setuptools.egg-info/requires.txt | 8 | ||||
| -rwxr-xr-x | setuptools/command/upload.py | 3 | ||||
| -rw-r--r-- | setuptools/compat.py | 4 | ||||
| -rwxr-xr-x | setuptools/package_index.py | 3 | ||||
| -rw-r--r-- | setuptools/py26compat.py | 19 | ||||
| -rw-r--r-- | setuptools/version.py | 2 |
10 files changed, 97 insertions, 55 deletions
@@ -94,3 +94,6 @@ aba16323ec9382da7bc77c633990ccb3bd58d050 1.0b2 8a98492f0d852402c93ddbbf3f07081909a9105f 1.0b3 c385fdf1f976fb1d2a6accc9292d8eca419180fa 1.0 d943b67fe80dbd61326014e4acedfc488adfa1c9 1.1 +2e42e86546100c9f6845b04eb31b75c5add05f78 1.1.1 +462fe5ccd8befeb2a235e8295d6d73eb3a49cc78 1.1.2 +ddf3561d6a54087745f4bf6ea2048b86195d6fe2 1.1.3 diff --git a/CHANGES.txt b/CHANGES.txt index 5a739571..634edd4e 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -2,12 +2,32 @@ CHANGES ======= ----- -next ----- +----- +1.1.4 +----- + +* Issue #77: Fix error in upload command (Python 2.4). + +----- +1.1.3 +----- + +* Fix NameError in previous patch. + +----- +1.1.2 +----- + +* Issue #69: Correct issue where 404 errors are returned for URLs with + fragments in them (such as #egg=). + +----- +1.1.1 +----- * Issue #75: Add ``--insecure`` option to ez_setup.py to accommodate environments where a trusted SSL connection cannot be validated. +* Issue #76: Fix AttributeError in upload command with Python 2.4. --- 1.1 diff --git a/ez_setup.py b/ez_setup.py index 975501e4..79713bd8 100644 --- a/ez_setup.py +++ b/ez_setup.py @@ -29,7 +29,7 @@ try: except ImportError: USER_SITE = None -DEFAULT_VERSION = "1.2" +DEFAULT_VERSION = "1.1.4" DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/" def _python_cmd(*args): diff --git a/setuptools.egg-info/entry_points.txt b/setuptools.egg-info/entry_points.txt index abcafd65..d6b54060 100644 --- a/setuptools.egg-info/entry_points.txt +++ b/setuptools.egg-info/entry_points.txt @@ -1,62 +1,62 @@ [console_scripts] -easy_install = setuptools.command.easy_install:main easy_install-3.3 = setuptools.command.easy_install:main +easy_install = setuptools.command.easy_install:main -[setuptools.installation] -eggsecutable = setuptools.command.easy_install:bootstrap +[distutils.commands] +register = setuptools.command.register:register +install_lib = setuptools.command.install_lib:install_lib +build_ext = setuptools.command.build_ext:build_ext +develop = setuptools.command.develop:develop +install_scripts = setuptools.command.install_scripts:install_scripts +build_py = setuptools.command.build_py:build_py +install_egg_info = setuptools.command.install_egg_info:install_egg_info +egg_info = setuptools.command.egg_info:egg_info +bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm +alias = setuptools.command.alias:alias +bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst +easy_install = setuptools.command.easy_install:easy_install +test = setuptools.command.test:test +install = setuptools.command.install:install +setopt = setuptools.command.setopt:setopt +upload_docs = setuptools.command.upload_docs:upload_docs +bdist_egg = setuptools.command.bdist_egg:bdist_egg +rotate = setuptools.command.rotate:rotate +sdist = setuptools.command.sdist:sdist +saveopts = setuptools.command.saveopts:saveopts [distutils.setup_keywords] +test_suite = setuptools.dist:check_test_suite +packages = setuptools.dist:check_packages +use_2to3_fixers = setuptools.dist:assert_string_list +convert_2to3_doctests = setuptools.dist:assert_string_list +tests_require = setuptools.dist:check_requirements +test_loader = setuptools.dist:check_importable +extras_require = setuptools.dist:check_extras +zip_safe = setuptools.dist:assert_bool exclude_package_data = setuptools.dist:check_package_data eager_resources = setuptools.dist:assert_string_list -convert_2to3_doctests = setuptools.dist:assert_string_list -test_suite = setuptools.dist:check_test_suite +include_package_data = setuptools.dist:assert_bool package_data = setuptools.dist:check_package_data -packages = setuptools.dist:check_packages +use_2to3_exclude_fixers = setuptools.dist:assert_string_list +namespace_packages = setuptools.dist:check_nsp use_2to3 = setuptools.dist:assert_bool entry_points = setuptools.dist:check_entry_points -include_package_data = setuptools.dist:assert_bool -use_2to3_exclude_fixers = setuptools.dist:assert_string_list -extras_require = setuptools.dist:check_extras -test_loader = setuptools.dist:check_importable -install_requires = setuptools.dist:check_requirements -use_2to3_fixers = setuptools.dist:assert_string_list -tests_require = setuptools.dist:check_requirements dependency_links = setuptools.dist:assert_string_list -namespace_packages = setuptools.dist:check_nsp -zip_safe = setuptools.dist:assert_bool +install_requires = setuptools.dist:check_requirements [setuptools.file_finders] svn_cvs = setuptools.command.sdist:_default_revctrl +[setuptools.installation] +eggsecutable = setuptools.command.easy_install:bootstrap + [egg_info.writers] -dependency_links.txt = setuptools.command.egg_info:overwrite_arg +PKG-INFO = setuptools.command.egg_info:write_pkg_info requires.txt = setuptools.command.egg_info:write_requirements -namespace_packages.txt = setuptools.command.egg_info:overwrite_arg -entry_points.txt = setuptools.command.egg_info:write_entries depends.txt = setuptools.command.egg_info:warn_depends_obsolete +namespace_packages.txt = setuptools.command.egg_info:overwrite_arg eager_resources.txt = setuptools.command.egg_info:overwrite_arg -PKG-INFO = setuptools.command.egg_info:write_pkg_info +dependency_links.txt = setuptools.command.egg_info:overwrite_arg top_level.txt = setuptools.command.egg_info:write_toplevel_names - -[distutils.commands] -easy_install = setuptools.command.easy_install:easy_install -build_ext = setuptools.command.build_ext:build_ext -install = setuptools.command.install:install -saveopts = setuptools.command.saveopts:saveopts -install_egg_info = setuptools.command.install_egg_info:install_egg_info -bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm -test = setuptools.command.test:test -install_scripts = setuptools.command.install_scripts:install_scripts -egg_info = setuptools.command.egg_info:egg_info -upload_docs = setuptools.command.upload_docs:upload_docs -sdist = setuptools.command.sdist:sdist -bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst -alias = setuptools.command.alias:alias -rotate = setuptools.command.rotate:rotate -register = setuptools.command.register:register -develop = setuptools.command.develop:develop -bdist_egg = setuptools.command.bdist_egg:bdist_egg -install_lib = setuptools.command.install_lib:install_lib -build_py = setuptools.command.build_py:build_py -setopt = setuptools.command.setopt:setopt +entry_points.txt = setuptools.command.egg_info:write_entries diff --git a/setuptools.egg-info/requires.txt b/setuptools.egg-info/requires.txt index 6d385dc7..0b577c97 100644 --- a/setuptools.egg-info/requires.txt +++ b/setuptools.egg-info/requires.txt @@ -1,5 +1,8 @@ +[ssl:sys_platform=='win32' and python_version=='2.4'] +ctypes==1.0.2 + [ssl:python_version in '2.4, 2.5'] ssl==1.16 @@ -7,7 +10,4 @@ ssl==1.16 certifi==0.0.8 [ssl:sys_platform=='win32'] -wincertstore==0.1 - -[ssl:sys_platform=='win32' and python_version=='2.4'] -ctypes==1.0.2
\ No newline at end of file +wincertstore==0.1
\ No newline at end of file diff --git a/setuptools/command/upload.py b/setuptools/command/upload.py index 575e121e..a6eff385 100755 --- a/setuptools/command/upload.py +++ b/setuptools/command/upload.py @@ -119,7 +119,7 @@ class upload(Command): boundary = '--------------GHSKFJDLGDS7543FJKLFHRE75642756743254' sep_boundary = '\n--' + boundary end_boundary = sep_boundary + '--' - body = StringIO.StringIO() + body = StringIO() for key, value in data.items(): # handle multiple entries for the same name if not isinstance(value, list): @@ -158,7 +158,6 @@ class upload(Command): raise AssertionError("unsupported schema " + schema) data = '' - loglevel = log.INFO try: http.connect() http.putrequest("POST", url) diff --git a/setuptools/compat.py b/setuptools/compat.py index 3a961c0e..860c39f3 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 + from urllib import url2pathname, splittag import urllib2 from urllib2 import urlopen, HTTPError, URLError, unquote, splituser from urlparse import urlparse, urlunparse, urljoin, urlsplit, urlunsplit @@ -74,7 +74,7 @@ else: from urllib.request import urlopen, url2pathname from urllib.parse import ( urlparse, urlunparse, unquote, splituser, urljoin, urlsplit, - urlunsplit, + urlunsplit, splittag, ) xrange = range filterfalse = itertools.filterfalse diff --git a/setuptools/package_index.py b/setuptools/package_index.py index d949063e..4c9e40a7 100755 --- a/setuptools/package_index.py +++ b/setuptools/package_index.py @@ -22,6 +22,7 @@ from setuptools.compat import filterfalse from fnmatch import translate from setuptools.py24compat import hashlib from setuptools.py24compat import wraps +from setuptools.py26compat import strip_fragment from setuptools.py27compat import get_all_headers EGG_FRAGMENT = re.compile(r'^egg=([-A-Za-z0-9_.]+)$') @@ -660,7 +661,7 @@ class PackageIndex(Environment): fp, tfp, info = None, None, None try: checker = HashChecker.from_url(url) - fp = self.open_url(url) + fp = self.open_url(strip_fragment(url)) if isinstance(fp, HTTPError): raise DistutilsError( "Can't download %s: %s %s" % (url, fp.code,fp.msg) diff --git a/setuptools/py26compat.py b/setuptools/py26compat.py new file mode 100644 index 00000000..6fc00883 --- /dev/null +++ b/setuptools/py26compat.py @@ -0,0 +1,19 @@ +""" +Compatibility Support for Python 2.6 and earlier +""" + +import sys + +from setuptools.compat import splittag + +def strip_fragment(url): + """ + In `Python 8280 <http://bugs.python.org/issue8280>`_, Python 2.7 and + later was patched to disregard the fragment when making URL requests. + Do the same for Python 2.6 and earlier. + """ + url, fragment = splittag(url) + return url + +if sys.version_info < (2,7): + strip_fragment = lambda x: x diff --git a/setuptools/version.py b/setuptools/version.py index 64477cf2..bc50bee6 100644 --- a/setuptools/version.py +++ b/setuptools/version.py @@ -1 +1 @@ -__version__ = '1.2' +__version__ = '1.1.4' |