summaryrefslogtreecommitdiff
path: root/Lib/platform.py
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2009-03-26 18:35:37 +0000
committerBenjamin Peterson <benjamin@python.org>2009-03-26 18:35:37 +0000
commitf521b8c6d25544456394e5cd172b6a24d5d958a6 (patch)
treeec3b805d300d3e658f90a72e233379869199ce1d /Lib/platform.py
parentc9301355d8e176a4ec9952a44a7728d8663bf21b (diff)
downloadcpython-git-f521b8c6d25544456394e5cd172b6a24d5d958a6.tar.gz
add much better tests for python version information parsing
Diffstat (limited to 'Lib/platform.py')
-rwxr-xr-xLib/platform.py7
1 files changed, 2 insertions, 5 deletions
diff --git a/Lib/platform.py b/Lib/platform.py
index 35cf8bd968..2559798b53 100755
--- a/Lib/platform.py
+++ b/Lib/platform.py
@@ -1264,9 +1264,6 @@ _sys_version_parser = re.compile(
'\(#?([^,]+),\s*([\w ]+),\s*([\w :]+)\)\s*'
'\[([^\]]+)\]?')
-_jython_sys_version_parser = re.compile(
- r'([\d\.]+)')
-
_ironpython_sys_version_parser = re.compile(
r'IronPython\s*'
'([\d\.]+)'
@@ -1322,12 +1319,12 @@ def _sys_version(sys_version=None):
elif sys.platform[:4] == 'java':
# Jython
name = 'Jython'
- match = _jython_sys_version_parser.match(sys_version)
+ match = _sys_version_parser.match(sys_version)
if match is None:
raise ValueError(
'failed to parse Jython sys.version: %s' %
repr(sys_version))
- version, = match.groups()
+ version, buildno, builddate, buildtime, _ = match.groups()
branch = ''
revision = ''
compiler = sys.platform