diff options
| author | Benjamin Peterson <benjamin@python.org> | 2010-02-03 02:59:43 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2010-02-03 02:59:43 (GMT) |
| commit | d69fe2a8d3f618150a61e3679a4d370e5979efd4 (patch) | |
| tree | e0775e007ce033f4a7bfd31d0ff056c5f8a0b3d6 /Lib/test | |
| parent | f044812f9bfa66197f1fc67e5c81d4dbee31e267 (diff) | |
| download | cpython-d69fe2a8d3f618150a61e3679a4d370e5979efd4.zip cpython-d69fe2a8d3f618150a61e3679a4d370e5979efd4.tar.gz cpython-d69fe2a8d3f618150a61e3679a4d370e5979efd4.tar.bz2 | |
Merged revisions 77712,77740-77741,77756,77886,77902,77936 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r77712 | tarek.ziade | 2010-01-23 11:52:57 -0600 (Sat, 23 Jan 2010) | 1 line
fixed the 64bits tests for get_platform() - mac osx
........
r77740 | benjamin.peterson | 2010-01-24 21:58:21 -0600 (Sun, 24 Jan 2010) | 1 line
compare types with is not ==
........
r77741 | facundo.batista | 2010-01-25 00:15:01 -0600 (Mon, 25 Jan 2010) | 3 lines
Added a note about Event.is_set() syntax being new to 2.6
........
r77756 | tarek.ziade | 2010-01-26 11:20:37 -0600 (Tue, 26 Jan 2010) | 1 line
fixed bdist_msi imports and added a test module for distutils.command.bdist_msi
........
r77886 | benjamin.peterson | 2010-01-31 12:09:34 -0600 (Sun, 31 Jan 2010) | 1 line
move distutils.rst to different toc
........
r77902 | andrew.kuchling | 2010-01-31 20:04:26 -0600 (Sun, 31 Jan 2010) | 1 line
Add various items
........
r77936 | andrew.kuchling | 2010-02-02 20:19:14 -0600 (Tue, 02 Feb 2010) | 1 line
Add various items
........
Diffstat (limited to 'Lib/test')
| -rw-r--r-- | Lib/test/test_sysconfig.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/Lib/test/test_sysconfig.py b/Lib/test/test_sysconfig.py index 0f8f89a..5b50901 100644 --- a/Lib/test/test_sysconfig.py +++ b/Lib/test/test_sysconfig.py @@ -145,14 +145,14 @@ class TestSysConfig(unittest.TestCase): get_config_vars()['CFLAGS'] = ('-fno-strict-aliasing -DNDEBUG -g ' '-fwrapv -O3 -Wall -Wstrict-prototypes') - maxsize = sys.maxsize + maxint = sys.maxsize try: sys.maxsize = 2147483647 self.assertEquals(get_platform(), 'macosx-10.3-ppc') sys.maxsize = 9223372036854775807 self.assertEquals(get_platform(), 'macosx-10.3-ppc64') finally: - sys.maxsize = maxsize + sys.maxsize = maxint self._set_uname(('Darwin', 'macziade', '8.11.1', @@ -164,15 +164,14 @@ class TestSysConfig(unittest.TestCase): get_config_vars()['CFLAGS'] = ('-fno-strict-aliasing -DNDEBUG -g ' '-fwrapv -O3 -Wall -Wstrict-prototypes') - - maxsize = sys.maxsize + maxint = sys.maxsize try: sys.maxsize = 2147483647 self.assertEquals(get_platform(), 'macosx-10.3-i386') sys.maxsize = 9223372036854775807 self.assertEquals(get_platform(), 'macosx-10.3-x86_64') finally: - sys.maxsize = maxsize + sys.maxsize = maxint # macbook with fat binaries (fat, universal or fat64) os.environ['MACOSX_DEPLOYMENT_TARGET'] = '10.4' |