diff options
| author | Paul Ganssle <pganssle@users.noreply.github.com> | 2018-07-20 12:11:53 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-20 12:11:53 -0400 |
| commit | 5f510913b151998555034f70db0ceecc1e3a53b8 (patch) | |
| tree | ff5d66caa52e8804536960532ec480a16905903b /setuptools/command | |
| parent | b48d4900233169c1143adfdd64aa00230ae13f26 (diff) | |
| parent | 6e9ea31599c05df83501669def725b9e92b5b033 (diff) | |
| download | external_python_setuptools-5f510913b151998555034f70db0ceecc1e3a53b8.tar.gz external_python_setuptools-5f510913b151998555034f70db0ceecc1e3a53b8.tar.bz2 external_python_setuptools-5f510913b151998555034f70db0ceecc1e3a53b8.zip | |
Merge pull request #1416 from pganssle/use_six
Switch over to using six.PY{2,3} when possible
Diffstat (limited to 'setuptools/command')
| -rw-r--r-- | setuptools/command/bdist_egg.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/setuptools/command/bdist_egg.py b/setuptools/command/bdist_egg.py index 14530729..9f8df917 100644 --- a/setuptools/command/bdist_egg.py +++ b/setuptools/command/bdist_egg.py @@ -411,7 +411,7 @@ def scan_module(egg_dir, base, name, stubs): return True # Extension module pkg = base[len(egg_dir) + 1:].replace(os.sep, '.') module = pkg + (pkg and '.' or '') + os.path.splitext(name)[0] - if sys.version_info.major == 2: + if six.PY2: skip = 8 # skip magic & date elif sys.version_info < (3, 7): skip = 12 # skip magic & date & file size |