cpython: 935d7804d1be (original) (raw)

--- a/Doc/c-api/intro.rst +++ b/Doc/c-api/intro.rst @@ -64,9 +64,10 @@ The header files are typically installed located in the directories :file:{prefix}/include/pythonversion/ and :file:{exec_prefix}/include/pythonversion/, where :envvar:prefix and :envvar:exec_prefix are defined by the corresponding parameters to Python's -:program:configure script and version is sys.version[:3]. On Windows, -the headers are installed in :file:{prefix}/include, where :envvar:prefix is -the installation directory specified to the installer. +:program:configure script and version is +'%d.%d' % sys.version_info[:2]. On Windows, the headers are installed +in :file:{prefix}/include, where :envvar:prefix is the installation +directory specified to the installer. To include the headers, place both directories (if different) on your compiler's search path for includes. Do not place the parent directories on the search

--- a/Doc/includes/test.py +++ b/Doc/includes/test.py @@ -204,7 +204,7 @@ 2 import os import sys from distutils.util import get_platform -PLAT_SPEC = "%s-%s" % (get_platform(), sys.version[0:3]) +PLAT_SPEC = "%s-%d.%d" % (get_platform(), *sys.version_info[:2]) src = os.path.join("build", "lib.%s" % PLAT_SPEC) sys.path.append(src)

--- a/Doc/library/sysconfig.rst +++ b/Doc/library/sysconfig.rst @@ -163,7 +163,7 @@ Other functions .. function:: get_python_version() Return the MAJOR.MINOR Python version number as a string. Similar to

• sys.version[:3].

• '%d.%d' % sys.version_info[:2].

.. function:: get_platform()

--- a/Lib/distutils/command/bdist_msi.py +++ b/Lib/distutils/command/bdist_msi.py @@ -199,7 +199,7 @@ class bdist_msi(Command): target_version = self.target_version if not target_version: assert self.skip_build, "Should have already checked this"

•            target_version = sys.version[0:3][](#l4.7)

•            target_version = '%d.%d' % sys.version_info[:2][](#l4.8)
         plat_specifier = ".%s-%s" % (self.plat_name, target_version)[](#l4.9)
         build = self.get_finalized_command('build')[](#l4.10)
         build.build_lib = os.path.join(build.build_base,[](#l4.11)

--- a/Lib/distutils/command/bdist_wininst.py +++ b/Lib/distutils/command/bdist_wininst.py @@ -141,7 +141,7 @@ class bdist_wininst(Command): target_version = self.target_version if not target_version: assert self.skip_build, "Should have already checked this"

•            target_version = sys.version[0:3][](#l5.7)

•            target_version = '%d.%d' % sys.version_info[:2][](#l5.8)
         plat_specifier = ".%s-%s" % (self.plat_name, target_version)[](#l5.9)
         build = self.get_finalized_command('build')[](#l5.10)
         build.build_lib = os.path.join(build.build_base,[](#l5.11)

--- a/Lib/distutils/command/build.py +++ b/Lib/distutils/command/build.py @@ -81,7 +81,7 @@ class build(Command): "--plat-name only supported on Windows (try " "using './configure --help' on your platform)")

•    plat_specifier = ".%s-%s" % (self.plat_name, sys.version[0:3])[](#l6.7)

•    plat_specifier = ".%s-%d.%d" % (self.plat_name, *sys.version_info[:2])[](#l6.8)

# Make it so Python 2.x and Python 2.x with --with-pydebug don't # share the same build directories. Doing so confuses the build @@ -114,7 +114,7 @@ class build(Command): 'temp' + plat_specifier) if self.build_scripts is None: self.build_scripts = os.path.join(self.build_base,

•                                          'scripts-' + sys.version[0:3])[](#l6.16)

•                                          'scripts-%d.%d' % sys.version_info[:2])[](#l6.17)

if self.executable is None: self.executable = os.path.normpath(sys.executable)

--- a/Lib/distutils/command/install.py +++ b/Lib/distutils/command/install.py @@ -290,8 +290,8 @@ class install(Command): 'dist_version': self.distribution.get_version(), 'dist_fullname': self.distribution.get_fullname(), 'py_version': py_version,

•                        'py_version_short': py_version[0:3],[](#l7.7)

•                        'py_version_nodot': py_version[0] + py_version[2],[](#l7.8)

•                        'py_version_short': '%d.%d' % sys.version_info[:2],[](#l7.9)

•                        'py_version_nodot': '%d%d' % sys.version_info[:2],[](#l7.10)
                         'sys_prefix': prefix,[](#l7.11)
                         'prefix': prefix,[](#l7.12)
                         'sys_exec_prefix': exec_prefix,[](#l7.13)

--- a/Lib/distutils/command/install_egg_info.py +++ b/Lib/distutils/command/install_egg_info.py @@ -21,10 +21,10 @@ class install_egg_info(Command): def finalize_options(self): self.set_undefined_options('install_lib',('install_dir','install_dir'))

•    basename = "%s-%s-py%s.egg-info" % ([](#l8.7)

•    basename = "%s-%s-py%d.%d.egg-info" % ([](#l8.8)
         to_filename(safe_name(self.distribution.get_name())),[](#l8.9)
         to_filename(safe_version(self.distribution.get_version())),[](#l8.10)

•        sys.version[:3][](#l8.11)

•        *sys.version_info[:2][](#l8.12)
     )[](#l8.13)
     self.target = os.path.join(self.install_dir, basename)[](#l8.14)
     self.outputs = [self.target][](#l8.15)

--- a/Lib/distutils/sysconfig.py +++ b/Lib/distutils/sysconfig.py @@ -70,7 +70,7 @@ def get_python_version(): leaving off the patchlevel. Sample return values could be '1.5' or '2.2'. """

• return sys.version[:3]

• return '%d.%d' % sys.version_info[:2]

def get_python_inc(plat_specific=0, prefix=None):

--- a/Lib/distutils/tests/test_build.py +++ b/Lib/distutils/tests/test_build.py @@ -27,7 +27,7 @@ class BuildTestCase(support.TempdirManag # build_platlib is 'build/lib.platform-x.x[-pydebug]' # examples: # build/lib.macosx-10.3-i386-2.7

•    plat_spec = '.%s-%s' % (cmd.plat_name, sys.version[0:3])[](#l10.7)

•    plat_spec = '.%s-%d.%d' % (cmd.plat_name, *sys.version_info[:2])[](#l10.8)
     if hasattr(sys, 'gettotalrefcount'):[](#l10.9)
         self.assertTrue(cmd.build_platlib.endswith('-pydebug'))[](#l10.10)
         plat_spec += '-pydebug'[](#l10.11)

@@ -42,7 +42,8 @@ class BuildTestCase(support.TempdirManag self.assertEqual(cmd.build_temp, wanted) # build_scripts is build/scripts-x.x

•    wanted = os.path.join(cmd.build_base, 'scripts-' +  sys.version[0:3])[](#l10.16)

•    wanted = os.path.join(cmd.build_base,[](#l10.17)

•                          'scripts-%d.%d' % sys.version_info[:2])[](#l10.18)
     self.assertEqual(cmd.build_scripts, wanted)[](#l10.19)

# executable is os.path.normpath(sys.executable)

--- a/Lib/importlib/_bootstrap_external.py +++ b/Lib/importlib/_bootstrap_external.py @@ -593,7 +593,7 @@ class WindowsRegistryFinder: else: registry_key = cls.REGISTRY_KEY key = registry_key.format(fullname=fullname,

•                              sys_version=sys.version[:3])[](#l11.7)

•                              sys_version='%d.%d' % sys.version_info[:2])[](#l11.8)
     try:[](#l11.9)
         with cls._open_registry(key) as hkey:[](#l11.10)
             filepath = _winreg.QueryValue(hkey, '')[](#l11.11)

--- a/Lib/pydoc.py +++ b/Lib/pydoc.py @@ -1911,10 +1911,10 @@ has the same effect as typing a particul def intro(self): self.output.write(''' -Welcome to Python %s's help utility +Welcome to Python {0}'s help utility If this is your first time using Python, you should definitely check out -the tutorial on the Internet at http://docs.python.org/%s/tutorial/.[](#l12.11) +the tutorial on the Internet at http://docs.python.org/{0}/tutorial/.[](#l12.12) Enter the name of any module, keyword, or topic to get help on writing Python programs and using Python modules. To quit this help utility and @@ -1924,7 +1924,7 @@ To get a list of available modules, keyw "modules", "keywords", "symbols", or "topics". Each module also comes with a one-line summary of what it does; to list the modules whose name or summary contain a given string such as "spam", type "modules spam". -''' % tuple([sys.version[:3]]*2)) +'''.format('%d.%d' % sys.version_info[:2])) def list(self, items, columns=4, width=80): items = list(sorted(items))

--- a/Lib/site.py +++ b/Lib/site.py @@ -304,7 +304,7 @@ def getsitepackages(prefixes=None): if os.sep == '/': sitepackages.append(os.path.join(prefix, "lib",

•                                    "python" + sys.version[:3],[](#l13.7)

•                                    "python%d.%d" % sys.version_info[:2],[](#l13.8)
                                     "site-packages"))[](#l13.9)
     else:[](#l13.10)
         sitepackages.append(prefix)[](#l13.11)

@@ -317,7 +317,7 @@ def getsitepackages(prefixes=None): if framework: sitepackages.append( os.path.join("/Library", framework,

•                        sys.version[:3], "site-packages"))[](#l13.16)

•                        '%d.%d' % sys.version_info[:2], "site-packages"))[](#l13.17)

  return sitepackages def addsitepackages(known_paths, prefixes=None):

--- a/Lib/sysconfig.py +++ b/Lib/sysconfig.py @@ -86,8 +86,8 @@ from os.path import pardir, realpath

FIXME don't rely on sys.version here, its format is an implementation detail

of CPython, use sys.version_info or sys.hexversion

_PY_VERSION = sys.version.split()[0] -_PY_VERSION_SHORT = sys.version[:3] -_PY_VERSION_SHORT_NO_DOT = _PY_VERSION[0] + _PY_VERSION[2] +_PY_VERSION_SHORT = '%d.%d' % sys.version_info[:2] +_PY_VERSION_SHORT_NO_DOT = '%d%d' % sys.version_info[:2] _PREFIX = os.path.normpath(sys.prefix) _BASE_PREFIX = os.path.normpath(sys.base_prefix) _EXEC_PREFIX = os.path.normpath(sys.exec_prefix) @@ -386,7 +386,7 @@ def _generate_posix_vars(): module.build_time_vars = vars sys.modules[name] = module

• pybuilddir = 'build/lib.%s-%s' % (get_platform(), sys.version[:3])

• pybuilddir = 'build/lib.%s-%s' % (get_platform(), _PY_VERSION_SHORT) if hasattr(sys, "gettotalrefcount"): pybuilddir += '-pydebug' os.makedirs(pybuilddir, exist_ok=True) @@ -518,7 +518,7 @@ def get_config_vars(*args): _CONFIG_VARS['exec_prefix'] = _EXEC_PREFIX _CONFIG_VARS['py_version'] = _PY_VERSION _CONFIG_VARS['py_version_short'] = _PY_VERSION_SHORT

•    _CONFIG_VARS['py_version_nodot'] = _PY_VERSION[0] + _PY_VERSION[2][](#l14.27)

•    _CONFIG_VARS['py_version_nodot'] = _PY_VERSION_SHORT_NO_DOT[](#l14.28)
     _CONFIG_VARS['installed_base'] = _BASE_PREFIX[](#l14.29)
     _CONFIG_VARS['base'] = _PREFIX[](#l14.30)
     _CONFIG_VARS['installed_platbase'] = _BASE_EXEC_PREFIX[](#l14.31)

--- a/Lib/test/test_importlib/test_windows.py +++ b/Lib/test/test_importlib/test_windows.py @@ -40,7 +40,7 @@ def setup_module(machinery, name, path=N else: root = machinery.WindowsRegistryFinder.REGISTRY_KEY key = root.format(fullname=name,

•                  sys_version=sys.version[:3])[](#l15.7)

•                  sys_version='%d.%d' % sys.version_info[:2])[](#l15.8)

  try: with temp_module(name, "a = 1") as location: subkey = CreateKey(HKEY_CURRENT_USER, key)

--- a/Lib/test/test_site.py +++ b/Lib/test/test_site.py @@ -238,13 +238,14 @@ class HelperFunctionsTests(unittest.Test self.assertEqual(len(dirs), 2) wanted = os.path.join('/Library', sysconfig.get_config_var("PYTHONFRAMEWORK"),

•                              sys.version[:3],[](#l16.7)

•                              '%d.%d' % sys.version_info[:2],[](#l16.8)
                               'site-packages')[](#l16.9)
         self.assertEqual(dirs[1], wanted)[](#l16.10)
     elif os.sep == '/':[](#l16.11)
         # OS X non-framwework builds, Linux, FreeBSD, etc[](#l16.12)
         self.assertEqual(len(dirs), 1)[](#l16.13)

•        wanted = os.path.join('xoxo', 'lib', 'python' + sys.version[:3],[](#l16.14)

•        wanted = os.path.join('xoxo', 'lib',[](#l16.15)

•                              'python%d.%d' % sys.version_info[:2],[](#l16.16)
                               'site-packages')[](#l16.17)
         self.assertEqual(dirs[0], wanted)[](#l16.18)
     else:[](#l16.19)

--- a/Lib/test/test_venv.py +++ b/Lib/test/test_venv.py @@ -51,7 +51,7 @@ class BaseTest(unittest.TestCase): self.include = 'Include' else: self.bindir = 'bin'

•        self.lib = ('lib', 'python%s' % sys.version[:3])[](#l17.7)

•        self.lib = ('lib', 'python%d.%d' % sys.version_info[:2])[](#l17.8)
         self.include = 'include'[](#l17.9)
     if sys.platform == 'darwin' and '__PYVENV_LAUNCHER__' in os.environ:[](#l17.10)
         executable = os.environ['__PYVENV_LAUNCHER__'][](#l17.11)

--- a/Lib/urllib/request.py +++ b/Lib/urllib/request.py @@ -133,7 +133,7 @@ else: ]

used in User-Agent header sent

-version = sys.version[:3] +version = '%d.%d' % sys.version_info[:2] _opener = None def urlopen(url, data=None, timeout=socket._GLOBAL_DEFAULT_TIMEOUT,

--- a/Lib/xmlrpc/client.py +++ b/Lib/xmlrpc/client.py @@ -151,7 +151,7 @@ def escape(s): return s.replace(">", ">",)

used in User-Agent header sent

-version = sys.version[:3] +version = '%d.%d' % sys.version_info[:2]

xmlrpc integer limits

MAXINT = 2**31-1

--- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -568,7 +568,7 @@ clinic: $(BUILDPYTHON) (LINKCC)(LINKCC) (LINKCC)(PY_LDFLAGS) (LINKFORSHARED)−o(LINKFORSHARED) -o (LINKFORSHARED)−o@ Programs/python.o (BLDLIBRARY)(BLDLIBRARY) (BLDLIBRARY)(LIBS) (MODLIBS)(MODLIBS) (MODLIBS)(SYSLIBS) $(LDLAST) platform: $(BUILDPYTHON) pybuilddir.txt

• (RUNSHARED)(RUNSHARED) (RUNSHARED)(PYTHON_FOR_BUILD) -c 'import sys ; from sysconfig import get_platform ; print(get_platform()+"-"+sys.version[0:3])' >platform

• (RUNSHARED)(RUNSHARED) (RUNSHARED)(PYTHON_FOR_BUILD) -c 'import sys ; from sysconfig import get_platform ; print("%s-%d.%d" % (get_platform(), *sys.version_info[:2]))' >platform

Create build directory and generate the sysconfig build-time data there.

pybuilddir.txt contains the name of the build dir and is used for

--- a/Python/importlib_external.h +++ b/Python/importlib_external.h @@ -888,22 +888,23 @@ const unsigned char _Py_M__importlib_ext 87,105,110,100,111,119,115,82,101,103,105,115,116,114,121,70, 105,110,100,101,114,46,95,111,112,101,110,95,114,101,103,105, 115,116,114,121,99,2,0,0,0,0,0,0,0,6,0,0,

• 0,16,0,0,0,67,0,0,0,115,143,0,0,0,124,0,

• 0,16,0,0,0,67,0,0,0,115,147,0,0,0,124,0, 0,106,0,0,114,21,0,124,0,0,106,1,0,125,2,0, 110,9,0,124,0,0,106,2,0,125,2,0,124,2,0,106,

• 3,0,100,1,0,124,1,0,100,2,0,116,4,0,106,5,
• 0,100,0,0,100,3,0,133,2,0,25,131,0,2,125,3,
• 0,121,47,0,124,0,0,106,6,0,124,3,0,131,1,0,
• 143,25,0,125,4,0,116,7,0,106,8,0,124,4,0,100,
• 4,0,131,2,0,125,5,0,87,100,0,0,81,82,88,87,
• 110,22,0,4,116,9,0,107,10,0,114,138,0,1,1,1,
• 100,0,0,83,89,110,1,0,88,124,5,0,83,41,5,78,
• 114,119,0,0,0,90,11,115,121,115,95,118,101,114,115,105,
• 111,110,114,80,0,0,0,114,30,0,0,0,41,10,218,11,
• 68,69,66,85,71,95,66,85,73,76,68,218,18,82,69,71,
• 73,83,84,82,89,95,75,69,89,95,68,69,66,85,71,218,
• 12,82,69,71,73,83,84,82,89,95,75,69,89,114,47,0,
• 0,0,114,7,0,0,0,218,7,118,101,114,115,105,111,110,

• 3,0,100,1,0,124,1,0,100,2,0,100,3,0,116,4,
• 0,106,5,0,100,0,0,100,4,0,133,2,0,25,22,131,
• 0,2,125,3,0,121,47,0,124,0,0,106,6,0,124,3,
• 0,131,1,0,143,25,0,125,4,0,116,7,0,106,8,0,
• 124,4,0,100,5,0,131,2,0,125,5,0,87,100,0,0,
• 81,82,88,87,110,22,0,4,116,9,0,107,10,0,114,142,
• 0,1,1,1,100,0,0,83,89,110,1,0,88,124,5,0,
• 83,41,6,78,114,119,0,0,0,90,11,115,121,115,95,118,
• 101,114,115,105,111,110,122,5,37,100,46,37,100,114,56,0,
• 0,0,114,30,0,0,0,41,10,218,11,68,69,66,85,71,
• 95,66,85,73,76,68,218,18,82,69,71,73,83,84,82,89,
• 95,75,69,89,95,68,69,66,85,71,218,12,82,69,71,73,
• 83,84,82,89,95,75,69,89,114,47,0,0,0,114,7,0,
• 0,0,218,12,118,101,114,115,105,111,110,95,105,110,102,111, 114,166,0,0,0,114,163,0,0,0,90,10,81,117,101,114, 121,86,97,108,117,101,114,40,0,0,0,41,6,114,164,0, 0,0,114,119,0,0,0,90,12,114,101,103,105,115,116,114, @@ -911,7 +912,7 @@ const unsigned char _Py_M__importlib_ext 218,8,102,105,108,101,112,97,116,104,114,4,0,0,0,114, 4,0,0,0,114,5,0,0,0,218,16,95,115,101,97,114, 99,104,95,114,101,103,105,115,116,114,121,77,2,0,0,115,

• 22,0,0,0,0,2,9,1,12,2,9,1,15,1,22,1,

• 22,0,0,0,0,2,9,1,12,2,9,1,15,1,26,1, 3,1,18,1,29,1,13,1,9,1,122,38,87,105,110,100, 111,119,115,82,101,103,105,115,116,114,121,70,105,110,100,101, 114,46,95,115,101,97,114,99,104,95,114,101,103,105,115,116,

--- 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'

--- a/Tools/scripts/nm2def.py +++ b/Tools/scripts/nm2def.py @@ -36,8 +36,8 @@ option to produce this format (since it """ 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')):

--- a/setup.py +++ b/setup.py @@ -2226,7 +2226,7 @@ def main(): setup(# PyPI Metadata (PEP 301) name = "Python", version = sys.version.split()[0],

•      url = "http://www.python.org/%s" % sys.version[:3],[](#l24.7)

•      url = "http://www.python.org/%d.%d" % sys.version_info[:2],[](#l24.8)
       maintainer = "Guido van Rossum and the Python community",[](#l24.9)
       maintainer_email = "python-dev@python.org",[](#l24.10)
       description = "A high-level object-oriented programming language",[](#l24.11)