summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeal Norwitz <nnorwitz@gmail.com>2005-12-18 04:10:10 (GMT)
committerNeal Norwitz <nnorwitz@gmail.com>2005-12-18 04:10:10 (GMT)
commit3dafaabfb5abe2ca1dd6d5a8985fb960374f7c7a (patch)
tree253e33f88dcc53817909171eeceafa6cd21d83f4
parent8856fb750b3417fc4770ad70cce56b4aad61c225 (diff)
downloadcpython-3dafaabfb5abe2ca1dd6d5a8985fb960374f7c7a.zip
cpython-3dafaabfb5abe2ca1dd6d5a8985fb960374f7c7a.tar.gz
cpython-3dafaabfb5abe2ca1dd6d5a8985fb960374f7c7a.tar.bz2
Fix _sys_version() so it works with the new buildno, not sure if it is correct. test_platform passes
-rwxr-xr-xLib/platform.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/Lib/platform.py b/Lib/platform.py
index 82f9fa7..f664098 100755
--- a/Lib/platform.py
+++ b/Lib/platform.py
@@ -1092,7 +1092,7 @@ def processor():
### Various APIs for extracting information from sys.version
_sys_version_parser = re.compile(r'([\w.+]+)\s*'
- '\(#(\d+),\s*([\w ]+),\s*([\w :]+)\)\s*'
+ '\(#?(\d+:?\d+M?),\s*([\w ]+),\s*([\w :]+)\)\s*'
'\[([^\]]+)\]?')
_sys_version_cache = None
@@ -1114,7 +1114,6 @@ def _sys_version():
return _sys_version_cache
version, buildno, builddate, buildtime, compiler = \
_sys_version_parser.match(sys.version).groups()
- buildno = int(buildno)
builddate = builddate + ' ' + buildtime
l = string.split(version, '.')
if len(l) == 2: