mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-04 22:20:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merged revisions 70594-70595 via svnmerge from

Browse source 
svn+pythonssh://pythondev@svn.python.org/python/trunk

........
  r70594 | marc-andre.lemburg | 2009-03-25 20:44:58 +0100 (Wed, 25 Mar 2009) | 9 lines

  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.
........
  r70595 | marc-andre.lemburg | 2009-03-25 20:45:33 +0100 (Wed, 25 Mar 2009) | 3 lines

  News item for the platform.py fix (r70594).
........
This commit is contained in:
Marc-André Lemburg 2009-03-25 19:52:04 +00:00
parent f70097684e
commit 152f222775
3 changed files with 37 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Lib/platform.py
View file

@ -1296,10 +1296,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
@ -1416,8 +1416,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():
@ -1429,8 +1427,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():