[Python-checkins] python/dist/src/Lib/test test_zipimport.py,1.4,1.5

jvr@users.sourceforge.net jvr@users.sourceforge.net
Thu, 09 Jan 2003 14:27:15 -0800


Update of /cvsroot/python/python/dist/src/Lib/test
In directory sc8-pr-cvs1:/tmp/cvs-serv24797

Modified Files:
	test_zipimport.py 
Log Message:
cleaned up Jack's Mac OS9 changes


Index: test_zipimport.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_zipimport.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** test_zipimport.py	8 Jan 2003 16:37:03 -0000	1.4
--- test_zipimport.py	9 Jan 2003 22:27:10 -0000	1.5
***************
*** 39,46 ****
  TESTPACK2 = "ziptestpackage2"
  TEMP_ZIP = os.path.abspath("junk95142.zip")
- if sys.platform == 'mac':
-     CURDIRPREFIX=':'
- else:
-     CURDIRPREFIX=''
  
  class UncompressedZipImportTestCase(ImportHooksBaseTestCase):
--- 39,42 ----
***************
*** 69,73 ****
                  file = mod.get_file()
                  self.assertEquals(file, os.path.join(TEMP_ZIP,
!                                   CURDIRPREFIX + os.sep.join(modules) + expected_ext))
          finally:
              z.close()
--- 65,69 ----
                  file = mod.get_file()
                  self.assertEquals(file, os.path.join(TEMP_ZIP,
!                                   *modules) + expected_ext)
          finally:
              z.close()