Browse Source

Fix import errors introduced with the core.pyd rename.

Harvir 10 years ago
parent
commit
f725cda60c

+ 1 - 1
direct/src/p3d/Packager.py

@@ -3361,7 +3361,7 @@ class Packager:
         self.currentPackage.addExtensionModules()
         self.currentPackage.freezer.reset()
 
-        self.do_file('panda3d/_core.pyd', newDir='panda3d')
+        self.do_file('panda3d/core.pyd', newDir='panda3d')
 
         # This is the key Python module that is imported at runtime to
         # start an application running.

+ 1 - 1
direct/src/plugin/p3dPythonRun.cxx

@@ -193,7 +193,7 @@ run_python() {
     return 1;
   }
 
-  // Set the __path__ such that it can find panda3d/_core.pyd, etc.
+  // Set the __path__ such that it can find panda3d/core.pyd, etc.
   Filename panda3d_dir(dir, "panda3d");
   string dir_str = panda3d_dir.to_os_specific();
   PyModule_AddObject(panda3d_module, "__path__", Py_BuildValue("[s#]", dir_str.data(), dir_str.length()));

+ 1 - 1
direct/src/showbase/VFSImporter.py

@@ -1,7 +1,7 @@
 __all__ = ['register', 'sharedPackages',
            'reloadSharedPackage', 'reloadSharedPackages']
 
-from panda3d._core import Filename, VirtualFileSystem, VirtualFileMountSystem, OFileStream, copyStream
+from panda3d.core import Filename, VirtualFileSystem, VirtualFileMountSystem, OFileStream, copyStream
 import sys
 import marshal
 import imp

+ 1 - 1
direct/src/stdpy/file.py

@@ -10,7 +10,7 @@ __all__ = [
     'execfile',
     ]
 
-import panda3d._core as core
+from panda3d import core
 import sys
 import os
 import io