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

Much better solution for Python 2.4 + 2.5 ;-)

Browse Source
This commit is contained in:
rdb 2009-11-16 08:12:16 +00:00
parent 89a18e62f7
commit a6d3da5eb9
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
direct/src/ffi/DoGenPyCode.py
View File

@ -262,14 +262,7 @@ def generateNativeWrappers():
# the library isn't present. This is particularly necessary
# in the runtime (plugin) environment, where all libraries are
# not necessarily downloaded.
if sys.version_info < (2, 5):
# In Python 2.4 and earlier, we didn't have the "except
# ImportError as err" syntax.
pandaModules.write('try:\n from %sModules import *\nexcept ImportError:\n print "Failed to import %s"\n\n' % (moduleName, moduleName))
else:
# Try to differentiate between missing files and other
# kinds of ImportErrors.
pandaModules.write('try:\n from %sModules import *\nexcept ImportError as err:\n if "DLL loader cannot find" not in str(err):\n raise\n print "Failed to import %s"\n\n' % (moduleName, moduleName))
pandaModules.write('try:\n from %sModules import *\nexcept ImportError, err:\n if "DLL loader cannot find" not in str(err):\n raise\n print "Failed to import %s"\n\n' % (moduleName, moduleName))
moduleModulesFilename = os.path.join(outputCodeDir, '%sModules.py' % (moduleName))
moduleModules = open(moduleModulesFilename, 'w')