[Python-checkins] r77057 - python/branches/py3k/Lib/distutils/tests/test_util.py

[ronald.oussoren]

Author: ronald.oussoren
Date: Sat Dec 26 14:16:15 2009
New Revision: 77057

Log:
Fix merge issue where I forgot to replace sys.maxint by sys.maxsize.


Modified:
   python/branches/py3k/Lib/distutils/tests/test_util.py

Modified: python/branches/py3k/Lib/distutils/tests/test_util.py
==============================================================================
--- python/branches/py3k/Lib/distutils/tests/test_util.py	(original)
+++ python/branches/py3k/Lib/distutils/tests/test_util.py	Sat Dec 26 14:16:15 2009
@@ -119,6 +119,26 @@
         sys.version = ('2.5 (r25:51918, Sep 19 2006, 08:49:13) '
                        '\n[GCC 4.0.1 (Apple Computer, Inc. build 5341)]')
         sys.platform = 'darwin'
+
+        self._set_uname(('Darwin', 'macziade', '8.11.1',
+                   ('Darwin Kernel Version 8.11.1: '
+                    'Wed Oct 10 18:23:28 PDT 2007; '
+                    'root:xnu-792.25.20~1/RELEASE_I386'), 'PowerPC'))
+        os.environ['MACOSX_DEPLOYMENT_TARGET'] = '10.3'
+
+        get_config_vars()['CFLAGS'] = ('-fno-strict-aliasing -DNDEBUG -g '
+                                       '-fwrapv -O3 -Wall -Wstrict-prototypes')
+
+        maxsize = 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
+
+
         self._set_uname(('Darwin', 'macziade', '8.11.1',
                    ('Darwin Kernel Version 8.11.1: '
                     'Wed Oct 10 18:23:28 PDT 2007; '
@@ -128,7 +148,15 @@
         get_config_vars()['CFLAGS'] = ('-fno-strict-aliasing -DNDEBUG -g '
                                        '-fwrapv -O3 -Wall -Wstrict-prototypes')
 
-        self.assertEquals(get_platform(), 'macosx-10.3-i386')
+        maxsize = 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
+
 
         # macbook with fat binaries (fat, universal or fat64)
         os.environ['MACOSX_DEPLOYMENT_TARGET'] = '10.4'
@@ -173,6 +201,7 @@
 
             self.assertEquals(get_platform(), 'macosx-10.4-%s'%(arch,))
 
+
         # linux debian sarge
         os.name = 'posix'
         sys.version = ('2.3.5 (#1, Jul  4 2007, 17:28:59) '