From: Thomas H. <th...@us...> - 2005-09-06 19:28:45
|
Update of /cvsroot/py2exe/py2exe In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17236 Modified Files: zipextimporter.py Log Message: Fix the import of extensions in packages. This made newer wxPython versions fail with bundle_files < 3. Index: zipextimporter.py =================================================================== RCS file: /cvsroot/py2exe/py2exe/zipextimporter.py,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** zipextimporter.py 29 Aug 2005 15:43:10 -0000 1.3 --- zipextimporter.py 6 Sep 2005 19:28:36 -0000 1.4 *************** *** 79,91 **** except zipimport.ZipImportError: pass ! initname = fullname.split(".")[-1] ! fullname = fullname.replace(".", "\\") ! if fullname in ("pywintypes", "pythoncom"): ! fullname = fullname + "%d%d" % sys.version_info[:2] for s in self._suffixes: ! path = fullname + s if path in self._files: code = self.get_data(path) ! mod = _memimporter.import_module(code, "init" + initname, path) mod.__file__ = "%s\\%s" % (self.archive, path) mod.__loader__ = self --- 79,93 ---- except zipimport.ZipImportError: pass ! initname = "init" + fullname.split(".")[-1] # name of initfunction ! filename = fullname.replace(".", "\\") ! if filename in ("pywintypes", "pythoncom"): ! filename = filename + "%d%d" % sys.version_info[:2] for s in self._suffixes: ! path = filename + s if path in self._files: + if _memimporter.get_verbose_flag(): + sys.stderr.write("# found %s in zipfile %s\n" % (path, self.archive)) code = self.get_data(path) ! mod = _memimporter.import_module(code, initname, fullname, path) mod.__file__ = "%s\\%s" % (self.archive, path) mod.__loader__ = self |