summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2013-12-01 06:12:06 -0500
committerJason R. Coombs <jaraco@jaraco.com>2013-12-01 06:12:06 -0500
commitec3014377e1369116da3bf71b6c5acaa3168b9dc (patch)
tree50b34e7f78946d79cfb005f73ccc903ec247be11
parent4ae4faeb1262435260ee8a5f2a0ab910fe96ea23 (diff)
downloadpython-setuptools-git-bootstrap-py24.tar.gz
Corrected a TypeError when reading a local package index on Python 3. Fixes #116.archive/bootstrap-py241.4.2bootstrap-py24
-rw-r--r--CHANGES.txt7
-rwxr-xr-xsetuptools/package_index.py2
2 files changed, 8 insertions, 1 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index b20d1683..09c6479e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -3,6 +3,13 @@ CHANGES
=======
-----
+1.4.2
+-----
+
+* Issue #116: Correct TypeError when reading a local package index on Python
+ 3.
+
+-----
1.4.1
-----
diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 4ffafa28..ef247cf3 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