From: <th...@us...> - 2008-11-07 06:49:46
|
Revision: 675 http://py2exe.svn.sourceforge.net/py2exe/?rev=675&view=rev Author: theller Date: 2008-11-07 06:49:39 +0000 (Fri, 07 Nov 2008) Log Message: ----------- Fix modulefinder crash on certain relative imports. Modified Paths: -------------- trunk/py2exe/ChangeLog trunk/py2exe/py2exe/mf.py trunk/py2exe/test/relative_import/x/__init__.py trunk/py2exe/test/test_relative_import.py Modified: trunk/py2exe/ChangeLog =================================================================== --- trunk/py2exe/ChangeLog 2008-11-01 12:37:24 UTC (rev 674) +++ trunk/py2exe/ChangeLog 2008-11-07 06:49:39 UTC (rev 675) @@ -1,3 +1,7 @@ +2008-11-06 Thomas Heller <th...@py...> + + * Fixed a modulefinder crash on certain relative imports. + 2008-11-01 Thomas Heller <th...@py...> * Changed the py2exe\samples\singlefile\gui\test_wx.py sample to Modified: trunk/py2exe/py2exe/mf.py =================================================================== --- trunk/py2exe/py2exe/mf.py 2008-11-01 12:37:24 UTC (rev 674) +++ trunk/py2exe/py2exe/mf.py 2008-11-07 06:49:39 UTC (rev 675) @@ -318,7 +318,10 @@ def _add_badmodule(self, name, caller): if name not in self.badmodules: self.badmodules[name] = {} - self.badmodules[name][caller.__name__] = 1 + if caller: + self.badmodules[name][caller.__name__] = 1 + else: + self.badmodules[name]["-"] = 1 def _safe_import_hook(self, name, caller, fromlist, level=-1): # wrapper for self.import_hook() that won't raise ImportError Modified: trunk/py2exe/test/relative_import/x/__init__.py =================================================================== --- trunk/py2exe/test/relative_import/x/__init__.py 2008-11-01 12:37:24 UTC (rev 674) +++ trunk/py2exe/test/relative_import/x/__init__.py 2008-11-07 06:49:39 UTC (rev 675) @@ -2,3 +2,5 @@ import sys as a from .. import sys as b + +def foo(): pass Modified: trunk/py2exe/test/test_relative_import.py =================================================================== --- trunk/py2exe/test/test_relative_import.py 2008-11-01 12:37:24 UTC (rev 674) +++ trunk/py2exe/test/test_relative_import.py 2008-11-07 06:49:39 UTC (rev 675) @@ -1,4 +1,5 @@ import relative_import.x +import relative_import.x.module if __name__ == "__main__": print relative_import.x.a.maxint This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |