diff options
| -rwxr-xr-x | EasyInstall.txt | 3 | ||||
| -rwxr-xr-x | setuptools/command/easy_install.py | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/EasyInstall.txt b/EasyInstall.txt index 0b5ee71d..bd3a77a8 100755 --- a/EasyInstall.txt +++ b/EasyInstall.txt @@ -1100,6 +1100,9 @@ Release Notes/Change History ``PYTHONPATH`` directory with ``--multi-version``, unless an ``easy-install.pth`` file is already in use there. + * Construct ``.pth`` file paths in such a way that installing an egg whose + name begins with ``import`` doesn't cause a syntax error. + 0.6b1 * Better ambiguity management: accept ``#egg`` name/version even if processing what appears to be a correctly-named distutils file, and ignore ``.egg`` diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py index d6c02b9e..1bbe7b5c 100755 --- a/setuptools/command/easy_install.py +++ b/setuptools/command/easy_install.py @@ -1355,7 +1355,7 @@ class PthDistributions(Environment): """Write changed .pth file back to disk""" if not self.dirty: return - + data = '\n'.join(map(self.make_relative,self.paths)) if data: log.debug("Saving %s", self.filename) @@ -1394,7 +1394,7 @@ class PthDistributions(Environment): def make_relative(self,path): if normalize_path(os.path.dirname(path))==self.basedir: - return os.path.basename(path) + return os.path.join(os.curdir, os.path.basename(path)) return path @@ -1432,7 +1432,7 @@ def uncache_zipdir(path): del zdc[p] return - + def get_script_args(dist, executable=sys_executable): """Yield write_script() argument tuples for a distribution's entrypoints""" spec = str(dist.as_requirement()) |