summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorphillip.eby <phillip.eby@6015fed2-1504-0410-9fe1-9d1591cc4771>2009-10-28 17:09:53 +0000
committerphillip.eby <phillip.eby@6015fed2-1504-0410-9fe1-9d1591cc4771>2009-10-28 17:09:53 +0000
commit131f5fc2b368b1f0fbdf2fce9e6de620a66fac48 (patch)
tree9598f01732b6b5f26f9be7e3f6eaa52fcb3b6831
parent4a62b157d61766b62a7d3387fbb4a3c7a7f3d5b2 (diff)
downloadpython-setuptools-131f5fc2b368b1f0fbdf2fce9e6de620a66fac48.tar.gz
Fix for issue 88
git-svn-id: http://svn.python.org/projects/sandbox/trunk/setuptools@75924 6015fed2-1504-0410-9fe1-9d1591cc4771
-rwxr-xr-xsetuptools/package_index.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 70b75a6..1a4fabd 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