diff options
| -rwxr-xr-x | EasyInstall.txt | 4 | ||||
| -rwxr-xr-x | setuptools/package_index.py | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/EasyInstall.txt b/EasyInstall.txt index 2bf69e90..6dad8c41 100755 --- a/EasyInstall.txt +++ b/EasyInstall.txt @@ -1217,6 +1217,10 @@ displayed MD5 info (broken onto two lines for readability):: Release Notes/Change History ============================ +0.6final + * Fixed AttributeError under Python 2.3 when processing "HTTP authentication" + URLs (i.e., ones with a ``user:password@host``). + 0.6c11 * Fix installed script .exe files not working with 64-bit Python on Windows (wasn't actually released in 0.6c10 due to a lost checkin) diff --git a/setuptools/package_index.py b/setuptools/package_index.py index 70b75a6f..1a4fabde 100755 --- a/setuptools/package_index.py +++ b/setuptools/package_index.py @@ -1,6 +1,6 @@ """PyPI and direct package downloading""" import sys, os.path, re, urlparse, urllib2, shutil, random, socket, cStringIO -import httplib +import httplib, urllib from pkg_resources import * from distutils import log from distutils.errors import DistutilsError @@ -701,7 +701,7 @@ def open_with_auth(url): scheme, netloc, path, params, query, frag = urlparse.urlparse(url) if scheme in ('http', 'https'): - auth, host = urllib2.splituser(netloc) + auth, host = urllib.splituser(netloc) else: auth = None |