diff options
author | Jason R. Coombs <jaraco@jaraco.com> | 2014-06-22 09:23:42 -0400 |
---|---|---|
committer | Jason R. Coombs <jaraco@jaraco.com> | 2014-06-22 09:23:42 -0400 |
commit | f6b5e29275f9a54bda847de79760f24a613a3d28 (patch) | |
tree | 6669f1ad56d804b1018e2412480ff255d991fc20 /setuptools/command/install_egg_info.py | |
parent | 97fbee720d6dd5bda37dc2a945d60ec056d49d9e (diff) | |
parent | 8e3f9d3253d1d0fb820dad4249d5110d017595c1 (diff) | |
download | external_python_setuptools-f6b5e29275f9a54bda847de79760f24a613a3d28.tar.gz external_python_setuptools-f6b5e29275f9a54bda847de79760f24a613a3d28.tar.bz2 external_python_setuptools-f6b5e29275f9a54bda847de79760f24a613a3d28.zip |
Merge Pull Request 67 from bb://agronholm/bitbucket
Diffstat (limited to 'setuptools/command/install_egg_info.py')
-rwxr-xr-x | setuptools/command/install_egg_info.py | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/setuptools/command/install_egg_info.py b/setuptools/command/install_egg_info.py index 578aa3d4..183d8188 100755 --- a/setuptools/command/install_egg_info.py +++ b/setuptools/command/install_egg_info.py @@ -1,9 +1,9 @@ +from distutils import log, dir_util import os -import pkg_resources from setuptools import Command from setuptools.archive_util import unpack_archive -from distutils import log, dir_util +import pkg_resources class install_egg_info(Command): @@ -24,7 +24,7 @@ class install_egg_info(Command): ei_cmd = self.get_finalized_command("egg_info") basename = pkg_resources.Distribution( None, None, ei_cmd.egg_name, ei_cmd.egg_version - ).egg_name()+'.egg-info' + ).egg_name() + '.egg-info' self.source = ei_cmd.egg_info self.target = os.path.join(self.install_dir, basename) self.outputs = [self.target] @@ -34,12 +34,11 @@ class install_egg_info(Command): if os.path.isdir(self.target) and not os.path.islink(self.target): dir_util.remove_tree(self.target, dry_run=self.dry_run) elif os.path.exists(self.target): - self.execute(os.unlink, (self.target, ), "Removing " + self.target) + self.execute(os.unlink, (self.target,), "Removing " + self.target) if not self.dry_run: pkg_resources.ensure_directory(self.target) self.execute( - self.copytree, (), - "Copying %s to %s" % (self.source, self.target) + self.copytree, (), "Copying %s to %s" % (self.source, self.target) ) self.install_namespaces() @@ -58,6 +57,7 @@ class install_egg_info(Command): self.outputs.append(dst) log.debug("Copying %s to %s", src, dst) return dst + unpack_archive(self.source, self.target, skimmer) def install_namespaces(self): @@ -103,3 +103,4 @@ class install_egg_info(Command): nsp.add('.'.join(pkg)) pkg.pop() return sorted(nsp) + |