mirror of
https://github.com/python/cpython.git
synced 2025-11-24 20:30:18 +00:00
Remove the sys.version_info shortcut, since they cause the APIs
to return different information than the _sys_version() output used in previous Python versions. This also fixes issue5561: platform.python_version_tuple returns tuple of ints, should be strings Added more tests for the various platform functions.
This commit is contained in:
parent
9a1337b95e
commit
a519cfc953
2 changed files with 33 additions and 28 deletions
|
|
@ -1278,10 +1278,10 @@ _sys_version_cache = {}
|
|||
def _sys_version(sys_version=None):
|
||||
|
||||
""" Returns a parsed version of Python's sys.version as tuple
|
||||
(name, version, branch, revision, buildno, builddate, compiler)
|
||||
referring to the Python implementation name, version, branch,
|
||||
revision, build number, build date/time as string and the compiler
|
||||
identification string.
|
||||
(name, version, branch, revision, buildno, builddate, compiler)
|
||||
referring to the Python implementation name, version, branch,
|
||||
revision, build number, build date/time as string and the compiler
|
||||
identification string.
|
||||
|
||||
Note that unlike the Python sys.version, the returned value
|
||||
for the Python version will always include the patchlevel (it
|
||||
|
|
@ -1383,8 +1383,6 @@ def python_version():
|
|||
will always include the patchlevel (it defaults to 0).
|
||||
|
||||
"""
|
||||
if hasattr(sys, 'version_info'):
|
||||
return '%i.%i.%i' % sys.version_info[:3]
|
||||
return _sys_version()[1]
|
||||
|
||||
def python_version_tuple():
|
||||
|
|
@ -1396,8 +1394,6 @@ def python_version_tuple():
|
|||
will always include the patchlevel (it defaults to 0).
|
||||
|
||||
"""
|
||||
if hasattr(sys, 'version_info'):
|
||||
return sys.version_info[:3]
|
||||
return tuple(string.split(_sys_version()[1], '.'))
|
||||
|
||||
def python_branch():
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue