diff options
| author | Vinay Sajip <vinay_sajip@yahoo.co.uk> | 2013-06-19 11:45:38 +0100 |
|---|---|---|
| committer | Vinay Sajip <vinay_sajip@yahoo.co.uk> | 2013-06-19 11:45:38 +0100 |
| commit | 8d016844c5934fe8f7ee4c559ab5a1f2133fa6dc (patch) | |
| tree | 199a8e4792f87c951fcf82197061c35e5805d100 /setuptools/command/egg_info.py | |
| parent | 744a61f18bbfcbf7dfaa08886185b4595d8b7bcb (diff) | |
| parent | 5d9d3930f400a754f38be2a4de21a7f9ed00f5f4 (diff) | |
| download | external_python_setuptools-8d016844c5934fe8f7ee4c559ab5a1f2133fa6dc.tar.gz external_python_setuptools-8d016844c5934fe8f7ee4c559ab5a1f2133fa6dc.tar.bz2 external_python_setuptools-8d016844c5934fe8f7ee4c559ab5a1f2133fa6dc.zip | |
Merged upstream changes.
--HG--
branch : single-codebase
Diffstat (limited to 'setuptools/command/egg_info.py')
| -rwxr-xr-x | setuptools/command/egg_info.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py index 1a61dfcb..6b0d2426 100755 --- a/setuptools/command/egg_info.py +++ b/setuptools/command/egg_info.py @@ -8,7 +8,7 @@ from setuptools import Command from distutils.errors import * from distutils import log from setuptools.command.sdist import sdist -from setuptools.compat import basestring, PY3 +from setuptools.compat import basestring from distutils.util import convert_path from distutils.filelist import FileList as _FileList from pkg_resources import parse_requirements, safe_name, parse_version, \ @@ -416,7 +416,8 @@ def write_pkg_info(cmd, basename, filename): metadata.name, metadata.version = oldname, oldver safe = getattr(cmd.distribution,'zip_safe',None) - from setuptools.command import bdist_egg; bdist_egg.write_safety_flag(cmd.egg_info, safe) + from setuptools.command import bdist_egg + bdist_egg.write_safety_flag(cmd.egg_info, safe) def warn_depends_obsolete(cmd, basename, filename): if os.path.exists(filename): |