diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2009-09-13 15:37:26 +0200 |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2009-09-13 15:37:26 +0200 |
| commit | 2453e3c31dbb36ea82462373d240993649581d0e (patch) | |
| tree | 8eac08ff24077484e1b4799cfb2748030dc6bdba | |
| parent | 15a0f215d79be0bd7cbf521395377fd7c3168dfd (diff) | |
| parent | bd900046b3457bfd98ac36dfbdaac63d7acf0a67 (diff) | |
| download | external_python_setuptools-2453e3c31dbb36ea82462373d240993649581d0e.tar.gz external_python_setuptools-2453e3c31dbb36ea82462373d240993649581d0e.tar.bz2 external_python_setuptools-2453e3c31dbb36ea82462373d240993649581d0e.zip | |
Merge with upstream
--HG--
branch : distribute
extra : rebase_source : c2294f2326600bb24833e74265a03d19909f2f41
| -rwxr-xr-x | setuptools/package_index.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/setuptools/package_index.py b/setuptools/package_index.py index 48494aff..b6283dbc 100755 --- a/setuptools/package_index.py +++ b/setuptools/package_index.py @@ -197,6 +197,8 @@ class PackageIndex(Environment): base = f.url # handle redirects page = f.read() + charset = f.headers.get_param('charset') or 'latin-1' + page = page.decode(charset, "ignore") f.close() if url.startswith(self.index_url) and getattr(f,'code',None)!=404: page = self.process_index(url, page) |