aboutsummaryrefslogtreecommitdiffstats
path: root/setuptools/package_index.py
diff options
context:
space:
mode:
authorLennart Regebro <regebro@gmail.com>2010-07-24 14:56:42 +0100
committerLennart Regebro <regebro@gmail.com>2010-07-24 14:56:42 +0100
commit35b06106c2c50e0d0709f2e75be4bc8fe56aef34 (patch)
treef4ec6051f95bb428dda6b8df73e63971956eb204 /setuptools/package_index.py
parentfadd3a199f2c99ef0fb5d58e78016274cad6cc20 (diff)
downloadexternal_python_setuptools-35b06106c2c50e0d0709f2e75be4bc8fe56aef34.tar.gz
external_python_setuptools-35b06106c2c50e0d0709f2e75be4bc8fe56aef34.tar.bz2
external_python_setuptools-35b06106c2c50e0d0709f2e75be4bc8fe56aef34.zip
Only do the decoding if there is something to decode.
--HG-- branch : distribute extra : rebase_source : 6510b361ce8885f536a3babfc66a7ebdfaa25b2d
Diffstat (limited to 'setuptools/package_index.py')
-rwxr-xr-xsetuptools/package_index.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 1f9b6bd8..4ff96303 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -199,7 +199,7 @@ class PackageIndex(Environment):
base = f.url # handle redirects
page = f.read()
- if sys.version_info >= (3,):
+ if sys.version_info >= (3,) and not isinstance(f, urllib2.HTTPError):
charset = f.headers.get_param('charset') or 'latin-1'
page = page.decode(charset, "ignore")
f.close()