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

[cfbolz at codespeak.net]

Author: cfbolz
Date: Tue Dec 11 12:08:11 2007
New Revision: 49619

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:
test and fix for __init__. Of course I meant "interplevel" in the last checkin
message.


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	Tue Dec 11 12:08:11 2007
@@ -115,7 +115,7 @@
         w_inst = W_InstanceObject(space, self)
         w_init = w_inst.getattr(space, space.wrap('__init__'), False)
         if w_init is not None:
-            w_result = space.call(w_init, __args__)
+            w_result = space.call_args(w_init, __args__)
             if not space.is_w(w_result, space.w_None):
                 raise OperationError(
                     space.w_TypeError,

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	Tue Dec 11 12:08:11 2007
@@ -15,3 +15,12 @@
         assert a.__class__ is A
         assert a.__dict__ == {'b': 2}
 
+    def test_init(self):
+        class A:
+            __metaclass__ = nclassobj
+            a = 1
+            def __init__(self, a):
+                self.a = a
+        a = A(2)
+        assert a.a == 2
+