Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

more and more implementations now support sys.subversion

This commit is contained in:
Benjamin Peterson 2009-03-26 18:55:48 +00:00
parent f521b8c6d2
commit b457b89323
2 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Lib/platform.py
View File

@ -1311,8 +1311,6 @@ def _sys_version(sys_version=None):
'failed to parse IronPython sys.version: %s' % 'failed to parse IronPython sys.version: %s' %
repr(sys_version)) repr(sys_version))
version, alt_version, compiler = match.groups() version, alt_version, compiler = match.groups()
branch = ''
revision = ''
buildno = '' buildno = ''
builddate = '' builddate = ''
@ -1325,11 +1323,7 @@ def _sys_version(sys_version=None):
'failed to parse Jython sys.version: %s' % 'failed to parse Jython sys.version: %s' %
repr(sys_version)) repr(sys_version))
version, buildno, builddate, buildtime, _ = match.groups() version, buildno, builddate, buildtime, _ = match.groups()
branch = ''
revision = ''
compiler = sys.platform compiler = sys.platform
buildno = ''
builddate = ''
else: else:
# CPython # CPython
@ -1340,15 +1334,16 @@ def _sys_version(sys_version=None):
repr(sys_version)) repr(sys_version))
version, buildno, builddate, buildtime, compiler = \ version, buildno, builddate, buildtime, compiler = \
match.groups() match.groups()
if hasattr(sys, 'subversion'): name = 'CPython'
# sys.subversion was added in Python 2.5
name, branch, revision = sys.subversion
else:
name = 'CPython'
branch = ''
revision = ''
builddate = builddate + ' ' + buildtime builddate = builddate + ' ' + buildtime
if hasattr(sys, 'subversion'):
# sys.subversion was added in Python 2.5
_, branch, revision = sys.subversion
else:
branch = ''
revision = ''
# Add the patchlevel version if missing # Add the patchlevel version if missing
l = string.split(version, '.') l = string.split(version, '.')
if len(l) == 2: if len(l) == 2:

6
Lib/test/test_platform.py
View File

@ -73,10 +73,10 @@ class PlatformTest(unittest.TestCase):
("IronPython", "2.0.0", "", "", ("", ""), ("IronPython", "2.0.0", "", "", ("", ""),
".NET 2.0.50727.3053"), ".NET 2.0.50727.3053"),
("2.5 (trunk:6107, Mar 26 2009, 13:02:18) \n[Java HotSpot(TM) Client VM (\"Apple Computer, Inc.\")]", ("2.5 (trunk:6107, Mar 26 2009, 13:02:18) \n[Java HotSpot(TM) Client VM (\"Apple Computer, Inc.\")]",
None, "java1.5.0_16") ('Jython', 'trunk', '6107'), "java1.5.0_16")
: :
("Jython", "2.5.0", "", "", ("", ""), ("Jython", "2.5.0", "trunk", "6107",
"java1.5.0_16"), ('trunk:6107', 'Mar 26 2009'), "java1.5.0_16"),
} }
for (version_tag, subversion, sys_platform), info in \ for (version_tag, subversion, sys_platform), info in \
sys_versions.iteritems(): sys_versions.iteritems():