diff options
author | Georg Brandl <georg@python.org> | 2010-02-07 12:01:19 (GMT) |
---|---|---|
committer | Georg Brandl <georg@python.org> | 2010-02-07 12:01:19 (GMT) |
commit | 708c487abe105843a77b556dc3ddcb7a00cfd7cc (patch) | |
tree | 8a29df776607589821275fb964e1062a6c3db73a /Lib/test/test_platform.py | |
parent | 9d2fde7235f54d0feed91c451dadef118c982eff (diff) | |
download | cpython-708c487abe105843a77b556dc3ddcb7a00cfd7cc.zip cpython-708c487abe105843a77b556dc3ddcb7a00cfd7cc.tar.gz cpython-708c487abe105843a77b556dc3ddcb7a00cfd7cc.tar.bz2 |
Merged revisions 78035,78040,78043,78049-78050,78052-78054 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r78035 | georg.brandl | 2010-02-06 23:44:17 +0100 (Sa, 06 Feb 2010) | 1 line
Fix duplicate import.
........
r78040 | georg.brandl | 2010-02-07 00:08:00 +0100 (So, 07 Feb 2010) | 1 line
Fix a few UnboundLocalErrors in test_long.
........
r78043 | georg.brandl | 2010-02-07 00:12:19 +0100 (So, 07 Feb 2010) | 1 line
Remove duplicate test method.
........
r78049 | georg.brandl | 2010-02-07 00:33:33 +0100 (So, 07 Feb 2010) | 1 line
Fix import/access for some identifiers. _TestSharedCTypes does not seem to be executed?
........
r78050 | georg.brandl | 2010-02-07 00:34:10 +0100 (So, 07 Feb 2010) | 1 line
Fix more unbound locals in code paths that do not seem to be used.
........
r78052 | georg.brandl | 2010-02-07 00:54:04 +0100 (So, 07 Feb 2010) | 1 line
Add missing import when running these tests standalone.
........
r78053 | georg.brandl | 2010-02-07 00:54:43 +0100 (So, 07 Feb 2010) | 1 line
Fix some name errors in Mac modules.
........
r78054 | georg.brandl | 2010-02-07 00:58:25 +0100 (So, 07 Feb 2010) | 1 line
Add missing import.
........
Diffstat (limited to 'Lib/test/test_platform.py')
-rw-r--r-- | Lib/test/test_platform.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Lib/test/test_platform.py b/Lib/test/test_platform.py index c3fd323..2177123 100644 --- a/Lib/test/test_platform.py +++ b/Lib/test/test_platform.py @@ -128,8 +128,10 @@ class PlatformTest(unittest.TestCase): if os.path.isdir(sys.executable) and \ os.path.exists(sys.executable+'.exe'): # Cygwin horror - executable = executable + '.exe' - res = platform.libc_ver(sys.executable) + executable = sys.executable + '.exe' + else: + executable = sys.executable + res = platform.libc_ver(executable) def test_parse_release_file(self): |