From a204258dd30fc4c4e93606b594528673eeb739ba Mon Sep 17 00:00:00 2001
From: Mark Mine <mark.mine@disney.com>
Date: Fri, 2 Feb 2001 22:35:20 +0000
Subject: [PATCH] *** empty log message ***

---
 direct/src/showbase/PythonUtil.py | 44 ++++++++++++++++++++++++-------
 1 file changed, 35 insertions(+), 9 deletions(-)

diff --git a/direct/src/showbase/PythonUtil.py b/direct/src/showbase/PythonUtil.py
index d7ec6ee9ae..73c054de30 100644
--- a/direct/src/showbase/PythonUtil.py
+++ b/direct/src/showbase/PythonUtil.py
@@ -26,9 +26,42 @@ def apropos(obj, *args):
     Obsolete, use pdir
     """
     print 'Use pdir instead'
-    
+
+def getClassLineage(obj):
+    """ getClassLineage(obj): print object inheritance list """
+    # Just a dictionary, return dictionary
+    if type(obj) == types.DictionaryType:
+        return [obj]
+    # Instance, make a list with the instance and its class interitance
+    elif type(obj) == types.InstanceType:
+        return [obj] + getClassLineage(obj.__class__)
+    # Class, see what it derives from
+    elif type(obj) == types.ClassType:
+        lineage = [obj]
+        for c in obj.__bases__:
+            lineage = lineage + getClassLineage(c)
+        return lineage
+    # Not what I'm looking for
+    else:
+        return []
+
 def pdir(obj, str = None, fOverloaded = 0, width = None,
             fTruncate = 1, lineWidth = 75):
+    # Remove redundant class entries
+    uniqueLineage = []
+    for l in getClassLineage(obj):
+        if type(l) == types.ClassType:
+            if l in uniqueLineage:
+                break
+        uniqueLineage.append(l)
+    # Pretty print out directory info
+    print
+    for obj in uniqueLineage:
+        _pdir(obj, str, fOverloaded, width, fTruncate, lineWidth)
+        print
+
+def _pdir(obj, str = None, fOverloaded = 0, width = None,
+            fTruncate = 1, lineWidth = 75):
     """
     Print out a formatted list of members and methods of an instance or class
     """
@@ -40,6 +73,7 @@ def pdir(obj, str = None, fOverloaded = 0, width = None,
             padAfter = max(0,70 - length - padBefore)
             header = '*' * padBefore + name + '*' * padAfter
         print header
+        print
     def printInstanceHeader(i, printHeader = printHeader):
         printHeader(i.__class__.__name__ + ' INSTANCE INFO')
     def printClassHeader(c, printHeader = printHeader):
@@ -106,14 +140,6 @@ def pdir(obj, str = None, fOverloaded = 0, width = None,
             # Cut off line (keeping at least 1 char)
             value = value[:max(1,lineWidth - maxWidth)]
         print (format % key)[:maxWidth] + '\t' + value
-    # Check for parent classes
-    if type(obj) == types.InstanceType:
-        print
-        pdir(obj.__class__, str = str )
-    elif type(obj) == types.ClassType:
-        for parentClass in obj.__bases__:
-            print
-            pdir(parentClass, str = str)
 
 def aproposAll(obj):
     """