[Python-checkins] r86148 - python/branches/py3k/Lib/inspect.py

[benjamin.peterson]

Author: benjamin.peterson
Date: Thu Nov  4 01:38:49 2010
New Revision: 86148

Log:
classic classes are gone; whoppie\!

Modified:
   python/branches/py3k/Lib/inspect.py

Modified: python/branches/py3k/Lib/inspect.py
==============================================================================
--- python/branches/py3k/Lib/inspect.py	(original)
+++ python/branches/py3k/Lib/inspect.py	Thu Nov  4 01:38:49 2010
@@ -338,22 +338,10 @@
     return result
 
 # ----------------------------------------------------------- class helpers
-def _searchbases(cls, accum):
-    # Simulate the "classic class" search order.
-    if cls in accum:
-        return
-    accum.append(cls)
-    for base in cls.__bases__:
-        _searchbases(base, accum)
 
 def getmro(cls):
     "Return tuple of base classes (including cls) in method resolution order."
-    if hasattr(cls, "__mro__"):
-        return cls.__mro__
-    else:
-        result = []
-        _searchbases(cls, result)
-        return tuple(result)
+    return cls.__mro__
 
 # -------------------------------------------------- source code extraction
 def indentsize(line):