From 59b8349fe9bcf328437fc0b55d19ed76a1fca9c6 Mon Sep 17 00:00:00 2001 From: David Rose Date: Wed, 6 Sep 2006 17:55:30 +0000 Subject: [PATCH] new safe-import convention, from Josh Yelon --- direct/src/tkpanels/AnimPanel.py | 6 +++++- direct/src/tkpanels/DirectSessionPanel.py | 2 ++ direct/src/tkpanels/FSMInspector.py | 3 +++ direct/src/tkpanels/Inspector.py | 12 ++++++++---- direct/src/tkpanels/MopathRecorder.py | 2 ++ direct/src/tkpanels/NotifyPanel.py | 4 ++++ direct/src/tkpanels/ParticlePanel.py | 2 ++ direct/src/tkpanels/Placer.py | 2 ++ direct/src/tkpanels/TaskManagerPanel.py | 5 +++++ direct/src/tkwidgets/AppShell.py | 3 +++ direct/src/tkwidgets/Dial.py | 5 ++++- direct/src/tkwidgets/EntryScale.py | 3 +++ direct/src/tkwidgets/Floater.py | 5 ++++- direct/src/tkwidgets/ProgressBar.py | 3 +++ direct/src/tkwidgets/SceneGraphExplorer.py | 5 +++++ direct/src/tkwidgets/Slider.py | 5 ++++- direct/src/tkwidgets/Tree.py | 4 ++++ direct/src/tkwidgets/Valuator.py | 4 ++++ direct/src/tkwidgets/VectorWidgets.py | 4 ++++ direct/src/tkwidgets/WidgetPropertiesDialog.py | 4 ++++ 20 files changed, 75 insertions(+), 8 deletions(-) diff --git a/direct/src/tkpanels/AnimPanel.py b/direct/src/tkpanels/AnimPanel.py index 765632adc7..f87e69b49c 100644 --- a/direct/src/tkpanels/AnimPanel.py +++ b/direct/src/tkpanels/AnimPanel.py @@ -1,4 +1,8 @@ -"DIRECT Animation Control Panel" +"""DIRECT Animation Control Panel""" + +__all__ = ['AnimPanel', 'ActorControl'] + + ### SEE END OF FILE FOR EXAMPLE USEAGE ### diff --git a/direct/src/tkpanels/DirectSessionPanel.py b/direct/src/tkpanels/DirectSessionPanel.py index 6a4436d79d..438a2e2d87 100644 --- a/direct/src/tkpanels/DirectSessionPanel.py +++ b/direct/src/tkpanels/DirectSessionPanel.py @@ -1,5 +1,7 @@ """ DIRECT Session Main panel """ +__all__ = ['DirectSessionPanel'] + # Import Tkinter, Pmw, and the dial code from direct.showbase.TkGlobal import * from direct.tkwidgets.AppShell import * diff --git a/direct/src/tkpanels/FSMInspector.py b/direct/src/tkpanels/FSMInspector.py index 2e4bd73a17..b018748ac7 100644 --- a/direct/src/tkpanels/FSMInspector.py +++ b/direct/src/tkpanels/FSMInspector.py @@ -1,4 +1,7 @@ """ Finite State Machine Inspector module """ + +__all__ = ['FSMInspector', 'StateInspector'] + from direct.tkwidgets.AppShell import * from direct.showbase.TkGlobal import * from tkSimpleDialog import askstring diff --git a/direct/src/tkpanels/Inspector.py b/direct/src/tkpanels/Inspector.py index 5d307a2bc2..69c277acaf 100644 --- a/direct/src/tkpanels/Inspector.py +++ b/direct/src/tkpanels/Inspector.py @@ -1,7 +1,11 @@ -### Inspectors allow you to visually browse through the members of various python objects. -### To open an inspector, import this module, and execute inspector.inspect(anObject) -### I start IDLE with this command line: idle.py -c "from inspector import inspect" -### so that I can just type: inspect(anObject) any time. +"""Inspectors allow you to visually browse through the members of +various python objects. To open an inspector, import this module, and +execute inspector.inspect(anObject) I start IDLE with this command +line: idle.py -c "from inspector import inspect" +so that I can just type: inspect(anObject) any time.""" + + +__all__ = ['inspect', 'inspectorFor', 'Inspector', 'ModuleInspector', 'ClassInspector', 'InstanceInspector', 'FunctionInspector', 'InstanceMethodInspector', 'CodeInspector', 'ComplexInspector', 'DictionaryInspector', 'SequenceInspector', 'SliceInspector', 'InspectorWindow'] import string from direct.showbase.TkGlobal import * diff --git a/direct/src/tkpanels/MopathRecorder.py b/direct/src/tkpanels/MopathRecorder.py index c0da950750..665fe0be9e 100644 --- a/direct/src/tkpanels/MopathRecorder.py +++ b/direct/src/tkpanels/MopathRecorder.py @@ -1,5 +1,7 @@ """ Mopath Recorder Panel Module """ +__all__ = ['MopathRecorder'] + # Import Tkinter, Pmw, and the dial code from this directory tree. from pandac.PandaModules import * from direct.showbase.DirectObject import DirectObject diff --git a/direct/src/tkpanels/NotifyPanel.py b/direct/src/tkpanels/NotifyPanel.py index c89d11a34c..b6156b31fe 100644 --- a/direct/src/tkpanels/NotifyPanel.py +++ b/direct/src/tkpanels/NotifyPanel.py @@ -1,3 +1,7 @@ +"""Undocumented Module""" + +__all__ = ['NotifyPanel'] + class NotifyPanel: """NotifyPanel class: this class contains methods for creating diff --git a/direct/src/tkpanels/ParticlePanel.py b/direct/src/tkpanels/ParticlePanel.py index 81d1c82193..dc3df63dd0 100644 --- a/direct/src/tkpanels/ParticlePanel.py +++ b/direct/src/tkpanels/ParticlePanel.py @@ -1,5 +1,7 @@ """PANDA3D Particle Panel""" +__all__ = ['ParticlePanel'] + # Import Tkinter, Pmw, and the floater code from this directory tree. from direct.tkwidgets.AppShell import * from direct.showbase.TkGlobal import * diff --git a/direct/src/tkpanels/Placer.py b/direct/src/tkpanels/Placer.py index d99b73ee16..bec908ea61 100644 --- a/direct/src/tkpanels/Placer.py +++ b/direct/src/tkpanels/Placer.py @@ -1,5 +1,7 @@ """ DIRECT Nine DoF Manipulation Panel """ +__all__ = ['Placer', 'place'] + # Import Tkinter, Pmw, and the dial code from this directory tree. from pandac.PandaModules import * from direct.showbase.TkGlobal import * diff --git a/direct/src/tkpanels/TaskManagerPanel.py b/direct/src/tkpanels/TaskManagerPanel.py index b7910f73f8..f7ca29e930 100644 --- a/direct/src/tkpanels/TaskManagerPanel.py +++ b/direct/src/tkpanels/TaskManagerPanel.py @@ -1,5 +1,10 @@ +"""Undocumented Module""" + +__all__ = ['TaskManagerPanel', 'TaskManagerWidget'] + from direct.tkwidgets.AppShell import * from Tkinter import * +from direct.showbase.DirectObject import DirectObject import Pmw class TaskManagerPanel(AppShell): diff --git a/direct/src/tkwidgets/AppShell.py b/direct/src/tkwidgets/AppShell.py index ac1767b476..c5013ca0de 100644 --- a/direct/src/tkwidgets/AppShell.py +++ b/direct/src/tkwidgets/AppShell.py @@ -4,6 +4,9 @@ This is an adaption of AppShell.py found in Python and Tkinter Programming by John E. Grayson which is a streamlined adaptation of GuiAppD.py, originally created by Doug Hellmann (doughellmann@mindspring.com). """ + +__all__ = ['AppShell'] + from direct.showbase.DirectObject import DirectObject from direct.showbase.TkGlobal import * from tkFileDialog import * diff --git a/direct/src/tkwidgets/Dial.py b/direct/src/tkwidgets/Dial.py index 501390b7c4..f4216ce844 100644 --- a/direct/src/tkwidgets/Dial.py +++ b/direct/src/tkwidgets/Dial.py @@ -2,9 +2,12 @@ Dial Class: Velocity style controller for floating point values with a label, entry (validated), and scale """ + +__all__ = ['Dial', 'AngleDial', 'DialWidget'] + from direct.showbase.TkGlobal import * from Tkinter import * -from Valuator import * +from Valuator import Valuator, VALUATOR_MINI, VALUATOR_FULL from direct.task import Task import math, string, operator, Pmw from pandac.PandaModules import ClockObject diff --git a/direct/src/tkwidgets/EntryScale.py b/direct/src/tkwidgets/EntryScale.py index b82d169286..21bc89744d 100644 --- a/direct/src/tkwidgets/EntryScale.py +++ b/direct/src/tkwidgets/EntryScale.py @@ -1,6 +1,9 @@ """ EntryScale Class: Scale with a label, and a linked and validated entry """ + +__all__ = ['EntryScale', 'EntryScaleGroup'] + from direct.showbase.DirectObject import DirectObject from direct.showbase.TkGlobal import * from Tkinter import * diff --git a/direct/src/tkwidgets/Floater.py b/direct/src/tkwidgets/Floater.py index c6b474d224..b4056d6900 100644 --- a/direct/src/tkwidgets/Floater.py +++ b/direct/src/tkwidgets/Floater.py @@ -2,9 +2,12 @@ Floater Class: Velocity style controller for floating point values with a label, entry (validated), and scale """ + +__all__ = ['Floater', 'FloaterWidget', 'FloaterGroup'] + from direct.showbase.TkGlobal import * from Tkinter import * -from Valuator import * +from Valuator import Valuator, VALUATOR_MINI, VALUATOR_FULL from direct.task import Task import math, sys, string, Pmw diff --git a/direct/src/tkwidgets/ProgressBar.py b/direct/src/tkwidgets/ProgressBar.py index 9f049c24fa..d9ed5d3824 100644 --- a/direct/src/tkwidgets/ProgressBar.py +++ b/direct/src/tkwidgets/ProgressBar.py @@ -1,6 +1,9 @@ """ A basic widget for showing the progress being made in a task. """ + +__all__ = ['ProgressBar'] + from direct.showbase.TkGlobal import * from Tkinter import * diff --git a/direct/src/tkwidgets/SceneGraphExplorer.py b/direct/src/tkwidgets/SceneGraphExplorer.py index 57ace391c0..93fc13c6df 100644 --- a/direct/src/tkwidgets/SceneGraphExplorer.py +++ b/direct/src/tkwidgets/SceneGraphExplorer.py @@ -1,7 +1,12 @@ +"""Undocumented Module""" + +__all__ = ['SceneGraphExplorer', 'SceneGraphExplorerItem', 'explore'] + from direct.showbase.DirectObject import DirectObject from direct.showbase.TkGlobal import * from Tkinter import * from Tree import * +import Pmw # changing these strings requires changing DirectSession.py SGE_ strs too! DEFAULT_MENU_ITEMS = [ diff --git a/direct/src/tkwidgets/Slider.py b/direct/src/tkwidgets/Slider.py index 4934658a5e..f1ff964be7 100644 --- a/direct/src/tkwidgets/Slider.py +++ b/direct/src/tkwidgets/Slider.py @@ -2,9 +2,12 @@ Slider Class: Velocity style controller for floating point values with a label, entry (validated), and min/max slider """ + +__all__ = ['Slider', 'SliderWidget', 'rgbPanel'] + from direct.showbase.TkGlobal import * from Tkinter import * -from Valuator import * +from Valuator import Valuator, rgbPanel, VALUATOR_MINI, VALUATOR_FULL from direct.task import Task import math, sys, string import operator, Pmw diff --git a/direct/src/tkwidgets/Tree.py b/direct/src/tkwidgets/Tree.py index 94e73218a5..7e263c18dd 100644 --- a/direct/src/tkwidgets/Tree.py +++ b/direct/src/tkwidgets/Tree.py @@ -1,3 +1,7 @@ +"""Undocumented Module""" + +__all__ = ['TreeNode', 'TreeItem'] + # ADAPTED FROM IDLE TreeWidget.py # XXX TO DO: # - popup menu diff --git a/direct/src/tkwidgets/Valuator.py b/direct/src/tkwidgets/Valuator.py index 7bf20de574..b53c5e0821 100644 --- a/direct/src/tkwidgets/Valuator.py +++ b/direct/src/tkwidgets/Valuator.py @@ -1,3 +1,7 @@ +"""Undocumented Module""" + +__all__ = ['Valuator', 'ValuatorGroup', 'ValuatorGroupPanel'] + from direct.showbase.DirectObject import * from direct.showbase.TkGlobal import * from Tkinter import * diff --git a/direct/src/tkwidgets/VectorWidgets.py b/direct/src/tkwidgets/VectorWidgets.py index 8720e04f89..d6c580e4d7 100644 --- a/direct/src/tkwidgets/VectorWidgets.py +++ b/direct/src/tkwidgets/VectorWidgets.py @@ -1,3 +1,7 @@ +"""Undocumented Module""" + +__all__ = ['VectorEntry', 'Vector2Entry', 'Vector3Entry', 'Vector4Entry', 'ColorEntry'] + from direct.showbase.TkGlobal import * from Tkinter import * import Valuator diff --git a/direct/src/tkwidgets/WidgetPropertiesDialog.py b/direct/src/tkwidgets/WidgetPropertiesDialog.py index eb6e815429..6418d89c0a 100644 --- a/direct/src/tkwidgets/WidgetPropertiesDialog.py +++ b/direct/src/tkwidgets/WidgetPropertiesDialog.py @@ -1,3 +1,7 @@ +"""Undocumented Module""" + +__all__ = ['WidgetPropertiesDialog'] + from direct.showbase.TkGlobal import * from Tkinter import * import types, string, Pmw