aboutsummaryrefslogtreecommitdiffstats
path: root/setuptools/command
diff options
context:
space:
mode:
authortarek <none@none>2010-01-06 23:39:15 +0100
committertarek <none@none>2010-01-06 23:39:15 +0100
commitfc7a598edb4c87b12fd17ebb274cfddf731ad8c8 (patch)
treef8fe1c7fb08765116a217590bd5420fd3bef01da /setuptools/command
parent58aef4573a45d88e82348d8e2978311de3bdd5ae (diff)
downloadexternal_python_setuptools-fc7a598edb4c87b12fd17ebb274cfddf731ad8c8.tar.gz
external_python_setuptools-fc7a598edb4c87b12fd17ebb274cfddf731ad8c8.tar.bz2
external_python_setuptools-fc7a598edb4c87b12fd17ebb274cfddf731ad8c8.zip
makes sure install_site_pyFixes #108
--HG-- branch : distribute extra : rebase_source : 1b1ddea2ccca03a0e67b35f2be573ef9a776a334
Diffstat (limited to 'setuptools/command')
-rwxr-xr-xsetuptools/command/easy_install.py4
1 files changed, 4 insertions, 0 deletions
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(