From: Just van Rossum <just@letterror.com>
Date: Thu, 9 Jan 2003 22:27:10 +0000 (+0000)
Subject: cleaned up Jack's Mac OS9 changes
X-Git-Tag: v2.3c1~2500
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6706c4d5fdea06db75cec76bd4815d9cecea108f;p=thirdparty%2FPython%2Fcpython.git

cleaned up Jack's Mac OS9 changes
---

diff --git a/Lib/test/test_zipimport.py b/Lib/test/test_zipimport.py
index 9bde605f7595..3c9457f765fd 100644
--- a/Lib/test/test_zipimport.py
+++ b/Lib/test/test_zipimport.py
@@ -38,10 +38,6 @@ TESTMOD = "ziptestmodule"
 TESTPACK = "ziptestpackage"
 TESTPACK2 = "ziptestpackage2"
 TEMP_ZIP = os.path.abspath("junk95142.zip")
-if sys.platform == 'mac':
-    CURDIRPREFIX=':'
-else:
-    CURDIRPREFIX=''
 
 class UncompressedZipImportTestCase(ImportHooksBaseTestCase):
 
@@ -68,7 +64,7 @@ class UncompressedZipImportTestCase(ImportHooksBaseTestCase):
             if expected_ext:
                 file = mod.get_file()
                 self.assertEquals(file, os.path.join(TEMP_ZIP,
-                                  CURDIRPREFIX + os.sep.join(modules) + expected_ext))
+                                  *modules) + expected_ext)
         finally:
             z.close()
             os.remove(TEMP_ZIP)