[Python-checkins] r57543 - sandbox/trunk/import_in_py/zipimport_/tests.py sandbox/trunk/import_in_py/zipimport_/zipimport.py

[brett.cannon]

Author: brett.cannon
Date: Mon Aug 27 04:21:46 2007
New Revision: 57543

Modified:
   sandbox/trunk/import_in_py/zipimport_/tests.py
   sandbox/trunk/import_in_py/zipimport_/zipimport.py
Log:
Re-implement get_data.


Modified: sandbox/trunk/import_in_py/zipimport_/tests.py
==============================================================================
--- sandbox/trunk/import_in_py/zipimport_/tests.py	(original)
+++ sandbox/trunk/import_in_py/zipimport_/tests.py	Mon Aug 27 04:21:46 2007
@@ -234,7 +234,7 @@
     test_support.run_unittest(ZipImportErrorTests,
                                 ZipImportCreation,
                                 FindModule,
-                                #GetData,
+                                GetData,
                                 #IsPackage,
                                 #GetSource,
                                 #GetCode,

Modified: sandbox/trunk/import_in_py/zipimport_/zipimport.py
==============================================================================
--- sandbox/trunk/import_in_py/zipimport_/zipimport.py	(original)
+++ sandbox/trunk/import_in_py/zipimport_/zipimport.py	Mon Aug 27 04:21:46 2007
@@ -122,8 +122,7 @@
         source or bytecode files.
 
         """
-        raise NotImplementedError
-        with contextlib.closing(zipfile.ZipFile(self._zip_path)) as zip_:
+        with contextlib.closing(zipfile.ZipFile(self.archive)) as zip_:
             try:
                 return zip_.open(pathname, 'r').read()
             except KeyError: