Commit fc7a598e authored by tarek's avatar tarek

makes sure install_site_pyFixes #108

--HG--
branch : distribute
extra : rebase_source : 1b1ddea2ccca03a0e67b35f2be573ef9a776a334
parent 58aef457
...@@ -9,6 +9,7 @@ CHANGES ...@@ -9,6 +9,7 @@ CHANGES
* Found another case of SandboxViolation - fixed * Found another case of SandboxViolation - fixed
* Issue 15 and 48: Introduced a socket timeout of 15 seconds on url openings * Issue 15 and 48: Introduced a socket timeout of 15 seconds on url openings
* Added indexsidebar.html into MANIFEST.in * Added indexsidebar.html into MANIFEST.in
* Issue 108: Fixed TypeError with Python3.1
------ ------
0.6.10 0.6.10
......
...@@ -1104,6 +1104,10 @@ Please make the appropriate changes for your system and try again.""" % ( ...@@ -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) log.debug("Checking existing site.py in %s", self.install_dir)
f = open(sitepy,'rb') f = open(sitepy,'rb')
current = f.read() current = f.read()
# we want str, not bytes
if sys.version_info >= (3,):
current = current.decode()
f.close() f.close()
if not current.startswith('def __boot():'): if not current.startswith('def __boot():'):
raise DistutilsError( raise DistutilsError(
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment