aboutsummaryrefslogtreecommitdiffstats
path: root/setuptools/package_index.py
diff options
context:
space:
mode:
authorPJ Eby <distutils-sig@python.org>2009-10-28 17:12:57 +0000
committerPJ Eby <distutils-sig@python.org>2009-10-28 17:12:57 +0000
commit03cee8b587cf41af1a4ad1071cb6aa7b97c4f182 (patch)
tree3d176c2a65a084d367a7ead0a5e2dc5429768ee7 /setuptools/package_index.py
parent2a5eaaedacf84a2992fd800203276b1079b96bd1 (diff)
downloadexternal_python_setuptools-03cee8b587cf41af1a4ad1071cb6aa7b97c4f182.tar.gz
external_python_setuptools-03cee8b587cf41af1a4ad1071cb6aa7b97c4f182.tar.bz2
external_python_setuptools-03cee8b587cf41af1a4ad1071cb6aa7b97c4f182.zip
Fix for issue 88
--HG-- branch : setuptools-0.6 extra : convert_revision : svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/sandbox/branches/setuptools-0.6%4075926
Diffstat (limited to 'setuptools/package_index.py')
-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 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