[pypy-svn] r49741 - in pypy/branch/interplevel-oldstyle-classes/pypy/module/__builtin__: . test

[cfbolz at codespeak.net]

Author: cfbolz
Date: Thu Dec 13 21:32:10 2007
New Revision: 49741

Modified:
   pypy/branch/interplevel-oldstyle-classes/pypy/module/__builtin__/interp_classobj.py
   pypy/branch/interplevel-oldstyle-classes/pypy/module/__builtin__/test/test_classobj.py
Log:
another bug


Modified: pypy/branch/interplevel-oldstyle-classes/pypy/module/__builtin__/interp_classobj.py
==============================================================================
--- pypy/branch/interplevel-oldstyle-classes/pypy/module/__builtin__/interp_classobj.py	(original)
+++ pypy/branch/interplevel-oldstyle-classes/pypy/module/__builtin__/interp_classobj.py	Thu Dec 13 21:32:10 2007
@@ -25,7 +25,7 @@
             w_metaclass = space.type(w_base)
             if space.is_true(space.callable(w_metaclass)):
                 return space.call_function(w_metaclass, w_name,
-                                           w_bases, w_dic)
+                                           w_bases, w_dict)
             raise OperationError(space.w_TypeError,
                                  space.wrap("base must be class"))
 

Modified: pypy/branch/interplevel-oldstyle-classes/pypy/module/__builtin__/test/test_classobj.py
==============================================================================
--- pypy/branch/interplevel-oldstyle-classes/pypy/module/__builtin__/test/test_classobj.py	(original)
+++ pypy/branch/interplevel-oldstyle-classes/pypy/module/__builtin__/test/test_classobj.py	Thu Dec 13 21:32:10 2007
@@ -609,3 +609,6 @@
             def __iter__(self):
                 return self
         raises(TypeError, "1 in A()")
+
+    def test_class_instantiation_bug(self):
+        raises(TypeError, "class A(1, 2): __metaclass__ = nclassobj")