diff options
| author | Martin Panter <vadmium+py@gmail.com> | 2016-06-08 06:12:22 +0000 |
|---|---|---|
| committer | Martin Panter <vadmium+py@gmail.com> | 2016-06-08 06:12:22 +0000 |
| commit | 21bbf7acd00a7cd7277cbe8f0ef1c3b883b50e2a (patch) | |
| tree | 4297f61b9359980f0975fe2e4f16db42228ca700 | |
| parent | 73b426a6a966c192e20c7a720be2d45a51f6f019 (diff) | |
| download | cpython-21bbf7acd00a7cd7277cbe8f0ef1c3b883b50e2a.tar.gz | |
Issue #21313: Tolerate truncated buildinfo in sys.version
| -rwxr-xr-x | Lib/platform.py | 15 | ||||
| -rw-r--r-- | Lib/test/test_platform.py | 16 | ||||
| -rw-r--r-- | Misc/NEWS | 3 |
3 files changed, 30 insertions, 4 deletions
diff --git a/Lib/platform.py b/Lib/platform.py index ff036e38cf..d58494c5d9 100755 --- a/Lib/platform.py +++ b/Lib/platform.py @@ -1146,9 +1146,11 @@ def processor(): ### Various APIs for extracting information from sys.version _sys_version_parser = re.compile( - r'([\w.+]+)\s*' - '\(#?([^,]+),\s*([\w ]+),\s*([\w :]+)\)\s*' - '\[([^\]]+)\]?', re.ASCII) + r'([\w.+]+)\s*' # "version<space>" + r'\(#?([^,]+)' # "(#buildno" + r'(?:,\s*([\w ]*)' # ", builddate" + r'(?:,\s*([\w :]*))?)?\)\s*' # ", buildtime)<space>" + r'\[([^\]]+)\]?', re.ASCII) # "[compiler]" _ironpython_sys_version_parser = re.compile( r'IronPython\s*' @@ -1227,6 +1229,8 @@ def _sys_version(sys_version=None): 'failed to parse Jython sys.version: %s' % repr(sys_version)) version, buildno, builddate, buildtime, _ = match.groups() + if builddate is None: + builddate = '' compiler = sys.platform elif "PyPy" in sys_version: @@ -1249,7 +1253,10 @@ def _sys_version(sys_version=None): version, buildno, builddate, buildtime, compiler = \ match.groups() name = 'CPython' - builddate = builddate + ' ' + buildtime + if builddate is None: + builddate = '' + elif buildtime: + builddate = builddate + ' ' + buildtime if hasattr(sys, '_mercurial'): _, branch, revision = sys._mercurial diff --git a/Lib/test/test_platform.py b/Lib/test/test_platform.py index 3e53212fa1..ed18773326 100644 --- a/Lib/test/test_platform.py +++ b/Lib/test/test_platform.py @@ -76,6 +76,22 @@ class PlatformTest(unittest.TestCase): ('IronPython', '1.0.60816', '', '', '', '', '.NET 2.0.50727.42')), ('IronPython 1.0 (1.0.61005.1977) on .NET 2.0.50727.42', ('IronPython', '1.0.0', '', '', '', '', '.NET 2.0.50727.42')), + ('2.4.3 (truncation, date, t) \n[GCC]', + ('CPython', '2.4.3', '', '', 'truncation', 'date t', 'GCC')), + ('2.4.3 (truncation, date, ) \n[GCC]', + ('CPython', '2.4.3', '', '', 'truncation', 'date', 'GCC')), + ('2.4.3 (truncation, date,) \n[GCC]', + ('CPython', '2.4.3', '', '', 'truncation', 'date', 'GCC')), + ('2.4.3 (truncation, date) \n[GCC]', + ('CPython', '2.4.3', '', '', 'truncation', 'date', 'GCC')), + ('2.4.3 (truncation, d) \n[GCC]', + ('CPython', '2.4.3', '', '', 'truncation', 'd', 'GCC')), + ('2.4.3 (truncation, ) \n[GCC]', + ('CPython', '2.4.3', '', '', 'truncation', '', 'GCC')), + ('2.4.3 (truncation,) \n[GCC]', + ('CPython', '2.4.3', '', '', 'truncation', '', 'GCC')), + ('2.4.3 (truncation) \n[GCC]', + ('CPython', '2.4.3', '', '', 'truncation', '', 'GCC')), ): # branch and revision are not "parsed", but fetched # from sys._mercurial. Ignore them @@ -131,6 +131,9 @@ Core and Builtins Library ------- +- Issue #21313: Fix the "platform" module to tolerate when sys.version + contains truncated build information. + - Issue #26839: On Linux, :func:`os.urandom` now calls ``getrandom()`` with ``GRND_NONBLOCK`` to fall back on reading ``/dev/urandom`` if the urandom entropy pool is not initialized yet. Patch written by Colm Buckley. |