more __all__ fixes from Josh Yelon

direct/src/controls/BattleWalker.py

@@ -1,5 +1,7 @@
 
-from direct.showbase.ShowBaseGlobal import *
+from direct.showbase.InputStateGlobal import inputState
+from direct.task.Task import Task
+from pandac.PandaModules import *
 import GravityWalker
 
 BattleStrafe = 0

direct/src/controls/ControlManager.py

@@ -1,5 +1,5 @@
 
-from direct.showbase.ShowBaseGlobal import *
+from direct.showbase.InputStateGlobal import inputState
 #from DirectGui import *
 #from PythonUtil import *
 #from IntervalGlobal import *
@@ -14,6 +14,7 @@ from direct.directnotify import DirectNotifyGlobal
 #    import DevWalker
 from direct.task import Task
 
+CollisionHandlerRayStart = 4000.0 # This is a hack, it may be better to use a line instead of a ray.
 
 class ControlManager:
     notify = DirectNotifyGlobal.directNotify.newCategory("ControlManager")

direct/src/controls/DevWalker.py

@@ -14,10 +14,11 @@ although it does send messeges that allow a listener to play sounds or
 animations based on walker events.
 """
 
-from direct.showbase.ShowBaseGlobal import *
-
+from direct.showbase.InputStateGlobal import inputState
 from direct.directnotify import DirectNotifyGlobal
 from direct.showbase import DirectObject
+from direct.task.Task import Task
+from pandac.PandaModules import *
 
 class DevWalker(DirectObject.DirectObject):
 

direct/src/controls/GravityWalker.py

@@ -13,10 +13,12 @@ it does not:
 although it does send messeges that allow a listener to play sounds or
 animations based on walker events.
 """
-from direct.showbase.ShowBaseGlobal import *
-
 from direct.directnotify.DirectNotifyGlobal import directNotify
 from direct.showbase import DirectObject
+from direct.controls.ControlManager import CollisionHandlerRayStart
+from direct.showbase.InputStateGlobal import inputState
+from direct.task.Task import Task
+from pandac.PandaModules import *
 import math
 
 

direct/src/controls/NonPhysicsWalker.py

@@ -14,10 +14,12 @@ although it does send messeges that allow a listener to play sounds or
 animations based on walker events.
 """
 
-from direct.showbase.ShowBaseGlobal import *
-
 from direct.directnotify import DirectNotifyGlobal
 from direct.showbase import DirectObject
+from direct.controls.ControlManager import CollisionHandlerRayStart
+from direct.showbase.InputStateGlobal import inputState
+from direct.task.Task import Task
+from pandac.PandaModules import *
 
 class NonPhysicsWalker(DirectObject.DirectObject):
     notify = DirectNotifyGlobal.directNotify.newCategory("NonPhysicsWalker")

direct/src/controls/ObserverWalker.py

@@ -15,7 +15,7 @@ animations based on walker events.
 """
 
 from direct.showbase.ShowBaseGlobal import *
-
+from pandac.PandaModules import *
 from direct.directnotify import DirectNotifyGlobal
 import NonPhysicsWalker
 

direct/src/controls/PhysicsWalker.py

@@ -14,11 +14,12 @@ although it does send messeges that allow a listener to play sounds or
 animations based on walker events.
 """
 
-from direct.showbase.ShowBaseGlobal import *
-
 from direct.directnotify import DirectNotifyGlobal
 from direct.showbase import DirectObject
-from pandac.PandaModules import PhysicsManager
+from direct.controls.ControlManager import CollisionHandlerRayStart
+from direct.showbase.InputStateGlobal import inputState
+from direct.task.Task import Task
+from pandac.PandaModules import *
 import math
 
 #import LineStream

direct/src/controls/ShipPilot.py

@@ -15,10 +15,12 @@ although it does send messeges that allow a listener to play sounds or
 animations based on control events.
 """
 
-from direct.showbase.ShowBaseGlobal import *
-
 from direct.directnotify.DirectNotifyGlobal import directNotify
 from pandac.PandaModules import PhysicsManager
+from direct.controls.ControlManager import CollisionHandlerRayStart
+from direct.showbase.InputStateGlobal import inputState
+from direct.task.Task import Task
+from pandac.PandaModules import *
 import math
 
 from PhysicsWalker import PhysicsWalker

direct/src/controls/ShipPilot2.py

@@ -15,10 +15,11 @@ although it does send messeges that allow a listener to play sounds or
 animations based on control events.
 """
 
-from direct.showbase.ShowBaseGlobal import *
-
 from direct.directnotify.DirectNotifyGlobal import directNotify
-from pandac.PandaModules import PhysicsManager
+from direct.controls.ControlManager import CollisionHandlerRayStart
+from direct.showbase.InputStateGlobal import inputState
+from direct.task.Task import Task
+from pandac.PandaModules import *
 import math
 
 from PhysicsWalker import PhysicsWalker

direct/src/controls/SwimWalker.py

@@ -1,4 +1,4 @@
-from direct.showbase.ShowBaseGlobal import *
+from direct.showbase.InputStateGlobal import inputState
 from direct.directnotify import DirectNotifyGlobal
 from direct.controls import NonPhysicsWalker
 

direct/src/distributed/DoInterestManager.py

@@ -13,6 +13,7 @@ from direct.showbase.PythonUtil import *
 from direct.showbase import DirectObject
 from PyDatagram import PyDatagram
 from direct.directnotify.DirectNotifyGlobal import directNotify
+import types
 
 class InterestState:
     StateActive = 'Active'

direct/src/showbase/Audio3DManager.py

@@ -1,3 +1,7 @@
+"""Undocumented Module"""
+
+__all__ = ['Audio3DManager']
+
 from pandac.PandaModules import VBase3
 from direct.task import Task
 #

direct/src/showbase/BufferViewer.py

@@ -1,3 +1,7 @@
+"""Undocumented Module"""
+
+__all__ = ['BufferViewer']
+
 from pandac.PandaModules import *
 from direct.task import Task
 from direct.directnotify.DirectNotifyGlobal import *

direct/src/showbase/BulletinBoard.py

@@ -1,3 +1,7 @@
+"""Undocumented Module"""
+
+__all__ = ['BulletinBoard']
+
 from direct.directnotify import DirectNotifyGlobal
 
 class BulletinBoard:

direct/src/showbase/BulletinBoardGlobal.py

@@ -1,5 +1,7 @@
 """instantiate global BulletinBoard object"""
 
+__all__ = ['bulletinBoard']
+
 import BulletinBoard
 
 bulletinBoard = BulletinBoard.BulletinBoard()

direct/src/showbase/BulletinBoardWatcher.py

@@ -1,3 +1,7 @@
+"""Undocumented Module"""
+
+__all__ = ['BulletinBoardWatcher']
+
 from direct.directnotify import DirectNotifyGlobal
 from direct.showbase.PythonUtil import Functor, makeList
 from direct.showbase import DirectObject

direct/src/showbase/DirectObject.py

@@ -1,3 +1,7 @@
+"""Undocumented Module"""
+
+__all__ = ['DirectObject']
+
 
 from MessengerGlobal import messenger
 

direct/src/showbase/EventGroup.py

@@ -1,3 +1,7 @@
+"""Undocumented Module"""
+
+__all__ = ['EventGroup']
+
 from direct.showbase import DirectObject
 from direct.showbase.PythonUtil import SerialNumGen, Functor
 

direct/src/showbase/EventManager.py

@@ -1,3 +1,7 @@
+"""Undocumented Module"""
+
+__all__ = ['EventManager']
+
 
 from MessengerGlobal import *
 from direct.task.TaskManagerGlobal import taskMgr

direct/src/showbase/EventManagerGlobal.py

@@ -1,3 +1,7 @@
+"""Undocumented Module"""
+
+__all__ = ['eventMgr']
+
 import EventManager
 
 eventMgr = EventManager.EventManager()

direct/src/showbase/ExcelHandler.py

@@ -1,3 +1,7 @@
+"""Undocumented Module"""
+
+__all__ = ['ExcelHandler']
+
 """
 A simple XML parser for Excel XML data. Built on top of xml.sax
 

direct/src/showbase/Factory.py

@@ -1,3 +1,7 @@
+"""Undocumented Module"""
+
+__all__ = ['Factory']
+
 from direct.directnotify.DirectNotifyGlobal import directNotify
 
 class Factory:

direct/src/showbase/FindCtaPaths.py

@@ -1,3 +1,7 @@
+"""Undocumented Module"""
+
+__all__ = ['deCygwinify', 'getPaths']
+
 """This module is used only by the VR Studio programmers who are using
 the ctattach tools.  It is imported before any other package, and its
 job is to figure out the correct paths to each of the packages.

direct/src/showbase/Finder.py

@@ -1,3 +1,7 @@
+"""Undocumented Module"""
+
+__all__ = ['findClass', 'rebindClass', 'copyFuncs', 'replaceMessengerFunc', 'replaceTaskMgrFunc', 'replaceStateFunc', 'replaceCRFunc', 'replaceAIRFunc', 'replaceIvalFunc']
+
 import time
 import types
 import os

direct/src/showbase/GarbageReport.py

@@ -1,3 +1,7 @@
+"""Undocumented Module"""
+
+__all__ = ['FakeObject', '_createGarbage', 'GarbageReport', 'GarbageLogger']
+
 from direct.directnotify.DirectNotifyGlobal import directNotify
 from direct.showbase.PythonUtil import gcDebugOn, safeRepr, fastRepr
 from direct.showbase.TaskThreaded import TaskThreaded, TaskThread

direct/src/showbase/InputStateGlobal.py

@@ -1,5 +1,7 @@
 """instantiate global InputState object"""
 
+__all__ = ['inputState']
+
 # This file had to be separated from MessengerGlobal to resolve a
 # circular include dependency with DirectObject.
 

direct/src/showbase/LerpBlendHelpers.py

@@ -1,5 +1,7 @@
 """LerpBlendHelpers module: contains LerpBlendHelpers class"""
 
+__all__ = ['getBlend']
+
 from pandac.PandaModules import *
 
 """global lerp blend types for lerp function"""

direct/src/showbase/Loader.py

@@ -1,5 +1,7 @@
 """Loader module: contains the Loader class"""
 
+__all__ = ['Loader']
+
 from pandac.PandaModules import *
 from direct.directnotify.DirectNotifyGlobal import *
 

direct/src/showbase/Messenger.py

@@ -1,3 +1,7 @@
+"""Undocumented Module"""
+
+__all__ = ['Messenger']
+
 
 from PythonUtil import *
 from direct.directnotify import DirectNotifyGlobal

direct/src/showbase/MessengerGlobal.py

@@ -1,5 +1,7 @@
 """instantiate global Messenger object"""
 
+__all__ = ['messenger']
+
 import Messenger
 
 messenger = Messenger.Messenger()

direct/src/showbase/MirrorDemo.py

@@ -1,3 +1,7 @@
+"""Undocumented Module"""
+
+__all__ = ['setupMirror', 'showFrustum']
+
 """This file demonstrates one way to create a mirror effect in Panda.
 Call setupMirror() to create a mirror in the world that reflects
 everything in front of it.

direct/src/showbase/ObjectPool.py

@@ -1,3 +1,7 @@
+"""Undocumented Module"""
+
+__all__ = ['Diff', 'ObjectPool']
+
 from direct.directnotify.DirectNotifyGlobal import directNotify
 from direct.showbase.PythonUtil import invertDictLossless, makeList, safeRepr
 from direct.showbase.PythonUtil import getNumberedTypedString

direct/src/showbase/ObjectReport.py

@@ -1,3 +1,7 @@
+"""Undocumented Module"""
+
+__all__ = ['ExclusiveObjectPool', 'ObjectReport']
+
 from direct.directnotify.DirectNotifyGlobal import directNotify
 from direct.showbase import DirectObject, ObjectPool, GarbageReport
 from direct.showbase.PythonUtil import makeList, Sync

direct/src/showbase/OnScreenDebug.py

@@ -1,3 +1,7 @@
+"""Undocumented Module"""
+
+__all__ = ['OnScreenDebug']
+
 
 
 from pandac.PandaModules import *

direct/src/showbase/PandaObject.py

@@ -1,3 +1,7 @@
+"""Undocumented Module"""
+
+__all__ = []
+
 ## from DirectObject import *
 ## from pandac.PandaModules import *
 ## 

direct/src/showbase/PhysicsManagerGlobal.py

@@ -1,4 +1,7 @@
 """PhysicsManagerGlobal module: contains the global physics manager"""
+
+__all__ = ['physicsMgr']
+
 from pandac.PandaModules import PhysicsManager
 
 physicsMgr = PhysicsManager()

direct/src/showbase/Pool.py

@@ -1,3 +1,7 @@
+"""Undocumented Module"""
+
+__all__ = ['Pool']
+
 """
 
 Pool is a collection of python objects that you can checkin and

direct/src/showbase/PythonUtil.py

@@ -1,3 +1,30 @@
+"""Undocumented Module"""
+
+__all__ = ['enumerate', 'unique', 'indent', 'nonRepeatingRandomList',
+'writeFsmTree', 'StackTrace', 'traceFunctionCall', 'traceParentCall',
+'printThisCall', 'tron', 'trace', 'troff', 'getClassLineage', 'pdir',
+'_pdir', '_is_variadic', '_has_keywordargs', '_varnames', '_getcode',
+'Signature', 'doc', 'adjust', 'difference', 'intersection', 'union',
+'sameElements', 'makeList', 'makeTuple', 'list2dict', 'invertDict',
+'invertDictLossless', 'uniqueElements', 'disjoint', 'contains',
+'replace', 'reduceAngle', 'fitSrcAngle2Dest', 'fitDestAngle2Src',
+'closestDestAngle2', 'closestDestAngle', 'binaryRepr', 'profile',
+'profiled', 'startProfile', 'printProfile', 'getSetterName',
+'getSetter', 'Functor', 'Stack', 'Queue', 'ParamObj', 
+'POD', 'bound', 'lerp', 'average', 'addListsByValue',
+'boolEqual', 'lineupPos', 'formatElapsedSeconds', 'solveQuadratic',
+'stackEntryInfo', 'lineInfo', 'callerInfo', 'lineTag',
+'findPythonModule', 'describeException', 'mostDerivedLast',
+'clampScalar', 'weightedChoice', 'randFloat', 'normalDistrib',
+'weightedRand', 'randUint31', 'randInt32', 'randUint32',
+'SerialNumGen', 'serialNum', 'uniqueName', 'Enum', 'Singleton',
+'SingletonError', 'printListEnum', 'gcDebugOn', 'safeRepr',
+'fastRepr', 'tagRepr', 'tagWithCaller', 'isDefaultValue', 'setTrace',
+'_equal', '_notEqual', '_isNone', '_notNone', '_contains', '_notIn',
+'ScratchPad', 'Sync', 'RefCounter', 'itype', 'getNumberedTypedString',
+'printNumberedTyped', 'DelayedCall', 'DelayedFunctor',
+'FrameDelayedCallback', 'ArgumentEater']
+
 import types
 import string
 import re
@@ -1810,47 +1837,6 @@ def uniqueName(name):
     global _serialGen
     return '%s-%s' % (name, _serialGen.next())
 
-def beginExports(modname):
-    """The beginExports/endExports construct is used to bracket
-    a set of top-level python declarations.  The effect is to
-    add those declarations to the module's list of exported
-    symbols.  In other words, the purpose of this bracketing
-    construct is to make it easier to properly initialize the
-    export-list for a module.  The parameter should be the
-    current module's name."""
-    if (sys.modules.has_key(modname) == 0):
-        raise "beginExports("+modname+"): no such module"
-    mod = sys.modules[modname]
-    if (mod.__dict__.has_key("__begin_exports__")):
-        raise "beginExports("+modname+"): incorrect nesting"
-    mod.__begin_exports__ = set(mod.__dict__.keys())
-    if (mod.__dict__.has_key("__all__")==0):
-        mod.__all__ = []
-
-def endExports(modname):
-    """The beginExports/endExports construct is used to bracket
-    a set of top-level python declarations.  The effect is to
-    add those declarations to the module's list of exported
-    symbols.  In other words, the purpose of this bracketing
-    construct is to make it easier to properly initialize the
-    export-list for a module.  The parameter should be the
-    current module's name."""
-    if (sys.modules.has_key(modname) == 0):
-        raise "beginExports("+modname+"): no such module"
-    mod = sys.modules[modname]
-    if (mod.__dict__.has_key("__begin_exports__")==0):
-        raise "beginExports("+modname+"): incorrect nesting"
-    begin_exports = mod.__begin_exports__
-    del mod.__dict__["__begin_exports__"]
-    end_exports = set(mod.__dict__.keys())
-    added = list(end_exports.difference(begin_exports))
-    for x in added:
-        if (x[0]!="_"):
-            mod.__all__.append(x)
-
-# __builtins__["beginExports"] = beginExports
-# __builtins__["endExports"] = endExports
-
 class Enum:
     """Pass in list of strings or string of comma-separated strings.
     Items are accessible as instance.item, and are assigned unique,

direct/src/showbase/RandomNumGen.py

@@ -1,5 +1,7 @@
 """RandomNumGen module: contains the RandomNumGen class"""
 
+__all__ = ['randHash', 'RandomNumGen']
+
 from direct.directnotify import DirectNotifyGlobal
 from pandac.PandaModules import Mersenne
 

direct/src/showbase/SfxPlayer.py

@@ -1,3 +1,7 @@
+"""Undocumented Module"""
+
+__all__ = ['SfxPlayer']
+
 
 import math
 from pandac.PandaModules import *

direct/src/showbase/ShadowDemo.py

@@ -1,3 +1,7 @@
+"""Undocumented Module"""
+
+__all__ = ['ShadowCaster', 'avatarShadow', 'piratesAvatarShadow', 'arbitraryShadow']
+
 
 """Create a cheesy shadow effect by rendering the view of an
 object (e.g. the local avatar) from a special camera as seen from

direct/src/showbase/ShadowPlacer.py

@@ -1,3 +1,7 @@
+"""Undocumented Module"""
+
+__all__ = ['ShadowPlacer']
+
 """
 ShadowPlacer.py places a shadow.
 
@@ -6,9 +10,9 @@ Or it may do that later, right now it puts a node on the surface under
 the its parent node.
 """
 
-from ShowBaseGlobal import *
-
+from direct.controls.ControlManager import CollisionHandlerRayStart
 from direct.directnotify import DirectNotifyGlobal
+from pandac.PandaModules import *
 import DirectObject
 
 class ShadowPlacer(DirectObject.DirectObject):

direct/src/showbase/ShowBase.py

@@ -1,3 +1,7 @@
+"""Undocumented Module"""
+
+__all__ = ['ShowBase', 'WindowControls']
+
 # This module redefines the builtin import function with one
 # that prints out every import it does in a hierarchical form
 # Annoying and very noisy, but sometimes useful
@@ -21,6 +25,7 @@ from direct.interval import IntervalManager
 from InputStateGlobal import inputState
 from direct.showbase.BufferViewer import BufferViewer
 from direct.task import Task
+from direct.directutil import Verify
 import EventManager
 import math
 import sys

direct/src/showbase/ShowBaseGlobal.py

@@ -1,8 +1,8 @@
 """instantiate global ShowBase object"""
 
-from ShowBase import *
+__all__ = []
 
-CollisionHandlerRayStart = 4000.0 # This is a hack, it may be better to use a line instead of a ray.
+from ShowBase import *
 
 # Create the showbase instance
 # This should be created by the game specific "start" file

direct/src/showbase/TaskThreaded.py

@@ -1,3 +1,7 @@
+"""Undocumented Module"""
+
+__all__ = ['TaskThreaded', 'TaskThread']
+
 from direct.directnotify.DirectNotifyGlobal import directNotify
 from direct.task import Task
 

direct/src/showbase/ThreeUpShow.py

@@ -1,3 +1,7 @@
+"""Undocumented Module"""
+
+__all__ = ['ThreeUpShow']
+
 
 import ShowBase
 

direct/src/showbase/TkGlobal.py

@@ -1,7 +1,13 @@
+"""Undocumented Module"""
+
+__all__ = ['taskMgr']
+
 from Tkinter import *
+from direct.task.TaskManagerGlobal import *
+from direct.task.Task import Task
 import Pmw
 import sys
-from direct.task import Task
+
 # This is required by the ihooks.py module used by Squeeze (used by
 # pandaSqueezer.py) so that Pmw initializes properly
 sys.modules['_Pmw'].__name__ = '_Pmw'
@@ -18,9 +24,6 @@ def tkLoop(self):
     # Run forever
     return Task.cont
 
-# Get the taskMgr
-from direct.task.TaskManagerGlobal import *
-
 def spawnTkLoop():
     # Spawn this task
     taskMgr.add(tkLoop, "tkLoop")

direct/src/showbase/Transitions.py

@@ -1,3 +1,7 @@
+"""Undocumented Module"""
+
+__all__ = ['Transitions']
+
 
 from pandac.PandaModules import *
 from direct.gui.DirectGui import *

direct/src/showbase/VerboseImport.py

@@ -1,3 +1,7 @@
+"""Undocumented Module"""
+
+__all__ = []
+
 
 import sys
 

direct/src/showbase/pandaSqueezeTool.py

@@ -1,3 +1,7 @@
+"""Undocumented Module"""
+
+__all__ = ['usage', 'Squeezer', 'Loader', 'boot', 'open', 'explode', 'getloader', 'squeeze', 'searchPath']
+
 #!/usr/bin/env python
 #
 # SQUEEZE

direct/src/showbase/pandaSqueezer.py

@@ -1,3 +1,7 @@
+"""Undocumented Module"""
+
+__all__ = []
+
 import os
 import sys
 import getopt

direct/src/task/Task.py

@@ -171,9 +171,11 @@ def pause(delayTime):
     task.name = 'pause'
     task.delayTime = delayTime
     return task
+Task.pause = staticmethod(pause)
 
 def sequence(*taskList):
     return make_sequence(taskList)
+Task.sequence = staticmethod(sequence)
 
 
 def make_sequence(taskList):
@@ -232,6 +234,7 @@ def resetSequence(task):
 
 def loop(*taskList):
     return make_loop(taskList)
+Task.loop = staticmethod(loop)
 
 def make_loop(taskList):
     def func(self):