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

fixed pdir for new FFI, took out apropos, merge to trunk

Browse Source
This commit is contained in:
Joe Shochet 2005-08-26 18:07:00 +00:00
parent bc1a7920dc
commit d30dc00fcf
1 changed files with 15 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
direct/src/showbase/PythonUtil.py
View File

@ -15,13 +15,6 @@ from direct.directutil import Verify
ScalarTypes = (types.FloatType, types.IntType, types.LongType) ScalarTypes = (types.FloatType, types.IntType, types.LongType)
# NOTE: ifAbsentPut has been replaced with Python's dictionary's builtin setdefault
# before:
# ifAbsentPut(dict, key, defaultValue)
# after:
# dict.setdefault(key, defaultValue)
# Please use setdefault instead -- Joe
def enumerate(L): def enumerate(L):
"""Returns (0, L[0]), (1, L[1]), etc., allowing this syntax: """Returns (0, L[0]), (1, L[1]), etc., allowing this syntax:
for i, item in enumerate(L): for i, item in enumerate(L):
@ -196,12 +189,6 @@ def troff():
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
def apropos(obj, *args):
"""
Obsolete, use pdir
"""
print 'Use pdir instead'
def getClassLineage(obj): def getClassLineage(obj):
""" """
print object inheritance list print object inheritance list
@ -209,20 +196,26 @@ def getClassLineage(obj):
if type(obj) == types.DictionaryType: if type(obj) == types.DictionaryType:
# Just a dictionary, return dictionary # Just a dictionary, return dictionary
return [obj] return [obj]
elif type(obj) == types.InstanceType: elif (type(obj) == types.InstanceType):
# Instance, make a list with the instance and its class interitance # Instance, make a list with the instance and its class interitance
return [obj] + getClassLineage(obj.__class__) return [obj] + getClassLineage(obj.__class__)
elif type(obj) == types.ClassType: elif ((type(obj) == types.ClassType) or
# Class, see what it derives from (type(obj) == types.TypeType)):
# Class or type, see what it derives from
lineage = [obj] lineage = [obj]
for c in obj.__bases__: for c in obj.__bases__:
lineage = lineage + getClassLineage(c) lineage = lineage + getClassLineage(c)
return lineage return lineage
# New FFI objects are types that are not defined.
# but they still act like classes
elif hasattr(obj, '__class__'):
# Instance, make a list with the instance and its class interitance
return [obj] + getClassLineage(obj.__class__)
else: else:
# Not what I'm looking for # Not what I'm looking for
return [] return []
def pdir(obj, str = None, fOverloaded = 0, width = None, def pdir(obj, str = None, width = None,
fTruncate = 1, lineWidth = 75, wantPrivate = 0): fTruncate = 1, lineWidth = 75, wantPrivate = 0):
# Remove redundant class entries # Remove redundant class entries
uniqueLineage = [] uniqueLineage = []
@ -234,10 +227,10 @@ def pdir(obj, str = None, fOverloaded = 0, width = None,
# Pretty print out directory info # Pretty print out directory info
uniqueLineage.reverse() uniqueLineage.reverse()
for obj in uniqueLineage: for obj in uniqueLineage:
_pdir(obj, str, fOverloaded, width, fTruncate, lineWidth, wantPrivate) _pdir(obj, str, width, fTruncate, lineWidth, wantPrivate)
print print
def _pdir(obj, str = None, fOverloaded = 0, width = None, def _pdir(obj, str = None, width = None,
fTruncate = 1, lineWidth = 75, wantPrivate = 0): fTruncate = 1, lineWidth = 75, wantPrivate = 0):
""" """
Print out a formatted list of members and methods of an instance or class Print out a formatted list of members and methods of an instance or class
@ -267,6 +260,9 @@ def _pdir(obj, str = None, fOverloaded = 0, width = None,
# Get dict # Get dict
if type(obj) == types.DictionaryType: if type(obj) == types.DictionaryType:
dict = obj dict = obj
# FFI objects are builtin types, they have no __dict__
elif not hasattr(obj, '__dict__'):
dict = {}
else: else:
dict = obj.__dict__ dict = obj.__dict__
# Adjust width # Adjust width
@ -433,13 +429,6 @@ class Signature:
return "%s(?)" % self.name return "%s(?)" % self.name
def aproposAll(obj):
"""
Print out a list of all members and methods (including overloaded methods)
of an instance or class
"""
apropos(obj, fOverloaded = 1, fTruncate = 0)
def doc(obj): def doc(obj):
if (isinstance(obj, types.MethodType)) or \ if (isinstance(obj, types.MethodType)) or \
(isinstance(obj, types.FunctionType)): (isinstance(obj, types.FunctionType)):