diff options
author | Matthew Iversen <teh.ivo@gmail.com> | 2014-06-22 21:48:22 +1000 |
---|---|---|
committer | Matthew Iversen <teh.ivo@gmail.com> | 2014-06-22 21:48:22 +1000 |
commit | 92683cba709e8ee497e2b8f4413d44ddcee5cc2f (patch) | |
tree | 4775f8cf439540fa9b49c4d7b6196dd7cb23d487 /setuptools/command/install_egg_info.py | |
parent | afea314acbcd6db19dcc96d84fa9652f71b883fb (diff) | |
download | external_python_setuptools-92683cba709e8ee497e2b8f4413d44ddcee5cc2f.tar.gz external_python_setuptools-92683cba709e8ee497e2b8f4413d44ddcee5cc2f.tar.bz2 external_python_setuptools-92683cba709e8ee497e2b8f4413d44ddcee5cc2f.zip |
Fix pep8 issues for install_egg_info
Diffstat (limited to 'setuptools/command/install_egg_info.py')
-rwxr-xr-x | setuptools/command/install_egg_info.py | 65 |
1 files changed, 23 insertions, 42 deletions
diff --git a/setuptools/command/install_egg_info.py b/setuptools/command/install_egg_info.py index 73b5ef73..411fce6b 100755 --- a/setuptools/command/install_egg_info.py +++ b/setuptools/command/install_egg_info.py @@ -1,7 +1,10 @@ +import os + +import pkg_resources from setuptools import Command from setuptools.archive_util import unpack_archive from distutils import log, dir_util -import os, pkg_resources + class install_egg_info(Command): """Install an .egg-info directory for the package""" @@ -16,7 +19,8 @@ class install_egg_info(Command): self.install_dir = None def finalize_options(self): - self.set_undefined_options('install_lib',('install_dir','install_dir')) + self.set_undefined_options('install_lib', + ('install_dir', 'install_dir')) ei_cmd = self.get_finalized_command("egg_info") basename = pkg_resources.Distribution( None, None, ei_cmd.egg_name, ei_cmd.egg_version @@ -27,14 +31,14 @@ class install_egg_info(Command): def run(self): self.run_command('egg_info') - target = self.target 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, (), + self.execute( + self.copytree, (), "Copying %s to %s" % (self.source, self.target) ) self.install_namespaces() @@ -44,50 +48,28 @@ class install_egg_info(Command): def copytree(self): # Copy the .egg-info tree to site-packages - def skimmer(src,dst): + def skimmer(src, dst): # filter out source-control directories; note that 'src' is always # a '/'-separated path, regardless of platform. 'dst' is a # platform-specific path. - for skip in '.svn/','CVS/': - if src.startswith(skip) or '/'+skip in src: + for skip in '.svn/', 'CVS/': + if src.startswith(skip) or '/' + skip in src: return None 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): nsp = self._get_all_ns_packages() - if not nsp: return - filename,ext = os.path.splitext(self.target) - filename += '-nspkg.pth'; self.outputs.append(filename) - log.info("Installing %s",filename) + if not nsp: + return + filename, ext = os.path.splitext(self.target) + filename += '-nspkg.pth' + self.outputs.append(filename) + log.info("Installing %s", filename) if not self.dry_run: - f = open(filename,'wt') + f = open(filename, 'wt') for pkg in nsp: # ensure pkg is not a unicode string under Python 2.7 pkg = str(pkg) @@ -101,10 +83,11 @@ class install_egg_info(Command): f.write( "import sys,types,os; " "p = os.path.join(sys._getframe(1).f_locals['sitedir'], " - "*%(pth)r); " + "*%(pth)r); " "ie = os.path.exists(os.path.join(p,'__init__.py')); " "m = not ie and " - "sys.modules.setdefault(%(pkg)r,types.ModuleType(%(pkg)r)); " + "sys.modules.setdefault(%(pkg)r, " + "types.ModuleType(%(pkg)r)); " "mp = (m or []) and m.__dict__.setdefault('__path__',[]); " "(p not in mp) and mp.append(p)%(trailer)s" % locals() @@ -118,8 +101,6 @@ class install_egg_info(Command): while pkg: nsp['.'.join(pkg)] = 1 pkg.pop() - nsp=list(nsp) + nsp = list(nsp) nsp.sort() # set up shorter names first return nsp - - |