diff options
author | Marc-André Lemburg <mal@egenix.com> | 2009-03-25 19:44:58 (GMT) |
---|---|---|
committer | Marc-André Lemburg <mal@egenix.com> | 2009-03-25 19:44:58 (GMT) |
commit | a519cfc9534016725435c23fc1840d7d43d47c3b (patch) | |
tree | 4deadf1b93bf2844bb78c8baa6b5571c42b32d02 | |
parent | 9a1337b95e488a46caa781853591c20fd1de3be9 (diff) | |
download | cpython-a519cfc9534016725435c23fc1840d7d43d47c3b.zip cpython-a519cfc9534016725435c23fc1840d7d43d47c3b.tar.gz cpython-a519cfc9534016725435c23fc1840d7d43d47c3b.tar.bz2 |
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.
-rwxr-xr-x | Lib/platform.py | 12 | ||||
-rw-r--r-- | Lib/test/test_platform.py | 49 |
2 files changed, 33 insertions, 28 deletions
diff --git a/Lib/platform.py b/Lib/platform.py index 906d918..35cf8bd 100755 --- a/Lib/platform.py +++ b/Lib/platform.py @@ -1278,10 +1278,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 @@ -1383,8 +1383,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(): @@ -1396,8 +1394,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(): diff --git a/Lib/test/test_platform.py b/Lib/test/test_platform.py index e6a1dea..cc1a0a9 100644 --- a/Lib/test/test_platform.py +++ b/Lib/test/test_platform.py @@ -25,39 +25,48 @@ class PlatformTest(unittest.TestCase): finally: os.remove(link) - def test_machine(self): - res = platform.machine() - - def test_node(self): - res = platform.node() - def test_platform(self): for aliased in (False, True): for terse in (False, True): res = platform.platform(aliased, terse) - def test_processor(self): - res = platform.processor() + def test_system(self): + res = platform.system() - def test_python_build(self): - res = platform.python_build() + def test_node(self): + res = platform.node() - def test_python_compiler(self): - res = platform.python_compiler() + def test_release(self): + res = platform.release() def test_version(self): - res1 = platform.version() - res2 = platform.version_tuple() + res = platform.version() + + def test_machine(self): + res = platform.machine() + + def test_processor(self): + res = platform.processor() + + def test_python_implementation(self): + res = platform.python_implementation() + + def test_python_version(self): + res1 = platform.python_version() + res2 = platform.python_version_tuple() self.assertEqual(res1, ".".join(res2)) - def test_release(self): - res = platform.release() + def test_python_branch(self): + res = platform.python_branch() - def test_system(self): - res = platform.system() + def test_python_revision(self): + res = platform.python_revision() - def test_version(self): - res = platform.version() + def test_python_build(self): + res = platform.python_build() + + def test_python_compiler(self): + res = platform.python_compiler() def test_system_alias(self): res = platform.system_alias( |