diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2013-12-01 06:17:58 -0500 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2013-12-01 06:17:58 -0500 |
| commit | 727a101b0a76bd93c35b41352b2a52ca261a8cf7 (patch) | |
| tree | 1b9d9ed384baf9b18c9b602f286a1dad3cd836ae /setuptools/package_index.py | |
| parent | 4e2c005f8702ed7e2bce31425748eb83f3e9db0f (diff) | |
| parent | af3e8f78ae796b4e517547608a6cafaa835c430f (diff) | |
| download | external_python_setuptools-727a101b0a76bd93c35b41352b2a52ca261a8cf7.tar.gz external_python_setuptools-727a101b0a76bd93c35b41352b2a52ca261a8cf7.tar.bz2 external_python_setuptools-727a101b0a76bd93c35b41352b2a52ca261a8cf7.zip | |
Merge with 1.4.2
Diffstat (limited to 'setuptools/package_index.py')
| -rwxr-xr-x | setuptools/package_index.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/setuptools/package_index.py b/setuptools/package_index.py index 12a062b5..0e51b72c 100755 --- a/setuptools/package_index.py +++ b/setuptools/package_index.py @@ -1039,7 +1039,7 @@ def local_open(url): files = [] for f in os.listdir(filename): if f=='index.html': - fp = open(os.path.join(filename,f),'rb') + fp = open(os.path.join(filename,f),'r') body = fp.read() fp.close() break @@ -1053,5 +1053,5 @@ def local_open(url): else: status, message, body = 404, "Path not found", "Not found" - return HTTPError(url, status, message, - {'content-type':'text/html'}, StringIO(body)) + headers = {'content-type': 'text/html'} + return HTTPError(url, status, message, headers, StringIO(body)) |