diff --git a/direct/src/directnotify/DirectNotify.py b/direct/src/directnotify/DirectNotify.py index f2b8e351d1..d61420e3f5 100644 --- a/direct/src/directnotify/DirectNotify.py +++ b/direct/src/directnotify/DirectNotify.py @@ -61,10 +61,8 @@ class DirectNotify: """ # We use ConfigVariableString instead of base.config, in case - # we're running before ShowBase has finished initializing; and - # we import it directly from libpandaexpress, in case we're - # running before libpanda.dll is available. - from libpandaexpress import ConfigVariableString + # we're running before ShowBase has finished initializing + from panda3d.core import ConfigVariableString dconfigParam = ("notify-level-" + categoryName) cvar = ConfigVariableString(dconfigParam, "") diff --git a/direct/src/directnotify/Notifier.py b/direct/src/directnotify/Notifier.py index 5b1508fa99..eb91d5244e 100644 --- a/direct/src/directnotify/Notifier.py +++ b/direct/src/directnotify/Notifier.py @@ -4,7 +4,7 @@ for the programmer/user """ from LoggerGlobal import defaultLogger from direct.showbase import PythonUtil -from libpandaexpress import ConfigVariableBool +from panda3d.core import ConfigVariableBool import time import types import sys @@ -18,7 +18,7 @@ class Notifier: # with the C++ notify system. streamWriter = None if ConfigVariableBool('notify-integrate', True): - from libpandaexpress import StreamWriter, Notify + from panda3d.core import StreamWriter, Notify streamWriter = StreamWriter(Notify.out(), False) showTime = ConfigVariableBool('notify-timestamp', False) diff --git a/direct/src/showbase/Messenger.py b/direct/src/showbase/Messenger.py index 56ec2958de..44248e6a4e 100644 --- a/direct/src/showbase/Messenger.py +++ b/direct/src/showbase/Messenger.py @@ -7,7 +7,7 @@ from PythonUtil import * from direct.directnotify import DirectNotifyGlobal import types -from libpandaexpress import ConfigVariableBool +from panda3d.core import ConfigVariableBool # If using the Toontown ActiveX launcher, this must be set true. # Also, Panda must be compiled with SIMPLE_THREADS or no HAVE_THREADS diff --git a/direct/src/showbase/ProfileSession.py b/direct/src/showbase/ProfileSession.py index ad2cdc2606..c2cd4f7b67 100755 --- a/direct/src/showbase/ProfileSession.py +++ b/direct/src/showbase/ProfileSession.py @@ -1,4 +1,4 @@ -from pandac.libpandaexpressModules import TrueClock +from panda3d.core import TrueClock from direct.directnotify.DirectNotifyGlobal import directNotify from direct.showbase.PythonUtil import ( StdoutCapture, _installProfileCustomFuncs,_removeProfileCustomFuncs, diff --git a/direct/src/showbase/PythonUtil.py b/direct/src/showbase/PythonUtil.py index 418bb86f6b..84ca4c32f6 100644 --- a/direct/src/showbase/PythonUtil.py +++ b/direct/src/showbase/PythonUtil.py @@ -63,7 +63,7 @@ from direct.directutil import Verify # Don't import libpandaexpressModules, which doesn't get built until # genPyCode. import direct.extensions_native.extension_native_helpers -from libpandaexpress import ConfigVariableBool +from panda3d.core import ConfigVariableBool ScalarTypes = (types.FloatType, types.IntType, types.LongType) diff --git a/direct/src/showbase/VFSImporter.py b/direct/src/showbase/VFSImporter.py index 3bf8275cfc..f9cc552a59 100644 --- a/direct/src/showbase/VFSImporter.py +++ b/direct/src/showbase/VFSImporter.py @@ -1,4 +1,4 @@ -from libpandaexpress import Filename, VirtualFileSystem, VirtualFileMountSystem, OFileStream, copyStream +from panda3d.core import Filename, VirtualFileSystem, VirtualFileMountSystem, OFileStream, copyStream import sys import os import marshal