From 472e7db5c0455b6d80326d75f619f7c0bfb3070f Mon Sep 17 00:00:00 2001
From: Jack Jansen <jack.jansen@cwi.nl>
Date: Wed, 8 Jan 2003 16:37:03 +0000
Subject: [PATCH] Various tweaks to make the test work on the Mac.

---
 Lib/test/test_zipimport.py | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/Lib/test/test_zipimport.py b/Lib/test/test_zipimport.py
index 3c790eb4dea..9bde605f759 100644
--- a/Lib/test/test_zipimport.py
+++ b/Lib/test/test_zipimport.py
@@ -15,7 +15,13 @@ import zipimport
 
 def make_pyc(co, mtime):
     data = marshal.dumps(co)
-    pyc = imp.get_magic() + struct.pack("<i", mtime) + data
+    if type(mtime) is type(0.0):
+    	# Mac mtimes need a bit of special casing
+    	if mtime < 0x7fffffff:
+    		mtime = int(mtime)
+    	else:
+    		mtime = int(-0x100000000L + long(mtime))
+    pyc = imp.get_magic() + struct.pack("<i", int(mtime)) + data
     return pyc
 
 NOW = time.time()
@@ -32,7 +38,10 @@ TESTMOD = "ziptestmodule"
 TESTPACK = "ziptestpackage"
 TESTPACK2 = "ziptestpackage2"
 TEMP_ZIP = os.path.abspath("junk95142.zip")
-
+if sys.platform == 'mac':
+    CURDIRPREFIX=':'
+else:
+    CURDIRPREFIX=''
 
 class UncompressedZipImportTestCase(ImportHooksBaseTestCase):
 
@@ -59,7 +68,7 @@ class UncompressedZipImportTestCase(ImportHooksBaseTestCase):
             if expected_ext:
                 file = mod.get_file()
                 self.assertEquals(file, os.path.join(TEMP_ZIP,
-                                  os.sep.join(modules) + expected_ext))
+                                  CURDIRPREFIX + os.sep.join(modules) + expected_ext))
         finally:
             z.close()
             os.remove(TEMP_ZIP)