[pypy-svn] rev 2089 - pypy/trunk/src/pypy/module

[arigo at codespeak.net]

Author: arigo
Date: Sun Oct 26 21:33:27 2003
New Revision: 2089

Modified:
   pypy/trunk/src/pypy/module/builtin.py
Log:
Couple of bug fixes


Modified: pypy/trunk/src/pypy/module/builtin.py
==============================================================================
--- pypy/trunk/src/pypy/module/builtin.py	(original)
+++ pypy/trunk/src/pypy/module/builtin.py	Sun Oct 26 21:33:27 2003
@@ -414,13 +414,15 @@
                 # XXX - Use of .__mro__ would be suggested, if the existance
                 #   of that attribute could be guarranted.
                 bases = klass.__bases__
-            except AttributeError: pass 
-            try:
-                #Note that since we are only interested in the keys,
-                #  the order we merge classes is unimportant
-                for base in bases:
-                    Dict.update(_classdir(base))
-            except TypeError: pass
+            except AttributeError: pass
+            else:
+                try:
+                    #Note that since we are only interested in the keys,
+                    #  the order we merge classes is unimportant
+                    for base in bases:
+                        Dict.update(_classdir(base))
+                except TypeError: pass
+            return Dict
         #End _classdir
 
         if len(args) > 1: