TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-04 10:54:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

freezer: work around Python modulefinder bug (bpo-35376)

Browse Source
This commit is contained in:
rdb 2018-12-02 16:26:22 +01:00
parent f2f4b4c264
commit 192913bf8e
1 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
direct/src/showutil/FreezeTool.py
View File

@ -2306,6 +2306,31 @@ class PandaModuleFinder(modulefinder.ModuleFinder):
self.msgout(2, "load_module ->", m) self.msgout(2, "load_module ->", m)
return m return m
# This function is provided here since the Python library version has a bug
# (see bpo-35376)
def _safe_import_hook(self, name, caller, fromlist, level=-1):
# wrapper for self.import_hook() that won't raise ImportError
if name in self.badmodules:
self._add_badmodule(name, caller)
return
try:
self.import_hook(name, caller, level=level)
except ImportError as msg:
self.msg(2, "ImportError:", str(msg))
self._add_badmodule(name, caller)
else:
if fromlist:
for sub in fromlist:
fullname = name + "." + sub
if fullname in self.badmodules:
self._add_badmodule(fullname, caller)
continue
try:
self.import_hook(name, caller, [sub], level=level)
except ImportError as msg:
self.msg(2, "ImportError:", str(msg))
self._add_badmodule(fullname, caller)
def find_module(self, name, path=None, parent=None): def find_module(self, name, path=None, parent=None):
""" Finds a module with the indicated name on the given search path """ Finds a module with the indicated name on the given search path
(or self.path if None). Returns a tuple like (fp, path, stuff), where (or self.path if None). Returns a tuple like (fp, path, stuff), where