diff options
| author | Serhiy Storchaka <storchaka@gmail.com> | 2016-02-11 11:10:36 (GMT) |
|---|---|---|
| committer | Serhiy Storchaka <storchaka@gmail.com> | 2016-02-11 11:10:36 (GMT) |
| commit | 885bdc4946890f4bb80557fab80c3874b2cc4d39 (patch) | |
| tree | be6280757afecfd1b41c886f651d6cafae384df1 /Tools | |
| parent | a9725f86a984f74e74f09c4808fc8f4b403728b2 (diff) | |
| download | cpython-885bdc4946890f4bb80557fab80c3874b2cc4d39.zip cpython-885bdc4946890f4bb80557fab80c3874b2cc4d39.tar.gz cpython-885bdc4946890f4bb80557fab80c3874b2cc4d39.tar.bz2 | |
Issue #25985: sys.version_info is now used instead of sys.version
to format short Python version.
Diffstat (limited to 'Tools')
| -rwxr-xr-x | Tools/freeze/freeze.py | 2 | ||||
| -rwxr-xr-x | Tools/scripts/nm2def.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Tools/freeze/freeze.py b/Tools/freeze/freeze.py index c075807..389fffd 100755 --- a/Tools/freeze/freeze.py +++ b/Tools/freeze/freeze.py @@ -218,7 +218,7 @@ def main(): ishome = os.path.exists(os.path.join(prefix, 'Python', 'ceval.c')) # locations derived from options - version = sys.version[:3] + version = '%d.%d' % sys.version_info[:2] flagged_version = version + sys.abiflags if win: extensions_c = 'frozen_extensions.c' diff --git a/Tools/scripts/nm2def.py b/Tools/scripts/nm2def.py index 8f07559..83bbcd7 100755 --- a/Tools/scripts/nm2def.py +++ b/Tools/scripts/nm2def.py @@ -36,8 +36,8 @@ option to produce this format (since it is the original v7 Unix format). """ import os, sys -PYTHONLIB = 'libpython'+sys.version[:3]+'.a' -PC_PYTHONLIB = 'Python'+sys.version[0]+sys.version[2]+'.dll' +PYTHONLIB = 'libpython%d.%d.a' % sys.version_info[:2] +PC_PYTHONLIB = 'Python%d%d.dll' % sys.version_info[:2] NM = 'nm -p -g %s' # For Linux, use "nm -g %s" def symbols(lib=PYTHONLIB,types=('T','C','D')): |