[Python-checkins] r75926 - in sandbox/branches/setuptools-0.6: EasyInstall.txt setuptools/package_index.py

phillip.eby python-checkins at python.org
Wed Oct 28 18:12:58 CET 2009


Author: phillip.eby
Date: Wed Oct 28 18:12:57 2009
New Revision: 75926

Log:
Fix for issue 88


Modified:
   sandbox/branches/setuptools-0.6/EasyInstall.txt
   sandbox/branches/setuptools-0.6/setuptools/package_index.py

Modified: sandbox/branches/setuptools-0.6/EasyInstall.txt
==============================================================================
--- sandbox/branches/setuptools-0.6/EasyInstall.txt	(original)
+++ sandbox/branches/setuptools-0.6/EasyInstall.txt	Wed Oct 28 18:12:57 2009
@@ -1217,6 +1217,10 @@
 Release Notes/Change History
 ============================
 
+0.6final
+ * Fixed AttributeError under Python 2.3 when processing "HTTP authentication"
+   URLs (i.e., ones with a ``user:password at 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)

Modified: sandbox/branches/setuptools-0.6/setuptools/package_index.py
==============================================================================
--- sandbox/branches/setuptools-0.6/setuptools/package_index.py	(original)
+++ sandbox/branches/setuptools-0.6/setuptools/package_index.py	Wed Oct 28 18:12:57 2009
@@ -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 @@
     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
 


More information about the Python-checkins mailing list