diff options
| -rw-r--r-- | CHANGES.txt | 1 | ||||
| -rwxr-xr-x | setuptools/command/easy_install.py | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/CHANGES.txt b/CHANGES.txt index 068d1a41..b16ad40f 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -9,6 +9,7 @@ CHANGES * Found another case of SandboxViolation - fixed * Issue 15 and 48: Introduced a socket timeout of 15 seconds on url openings * Added indexsidebar.html into MANIFEST.in +* Issue 108: Fixed TypeError with Python3.1 ------ 0.6.10 diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py index fb8cd74f..421d0c09 100755 --- a/setuptools/command/easy_install.py +++ b/setuptools/command/easy_install.py @@ -1104,6 +1104,10 @@ Please make the appropriate changes for your system and try again.""" % ( log.debug("Checking existing site.py in %s", self.install_dir) f = open(sitepy,'rb') current = f.read() + # we want str, not bytes + if sys.version_info >= (3,): + current = current.decode() + f.close() if not current.startswith('def __boot():'): raise DistutilsError( |