[pypy-commit] pypy py3k: fix these two tests after we killed func_* and im_self

[antocuni]

Author: Antonio Cuni <anto.cuni at gmail.com>
Branch: py3k
Changeset: r52728:97dcba2db8d1
Date: 2012-02-21 12:20 +0100
http://bitbucket.org/pypy/pypy/changeset/97dcba2db8d1/

Log:	fix these two tests after we killed func_* and im_self

diff --git a/pypy/interpreter/astcompiler/test/test_compiler.py b/pypy/interpreter/astcompiler/test/test_compiler.py
--- a/pypy/interpreter/astcompiler/test/test_compiler.py
+++ b/pypy/interpreter/astcompiler/test/test_compiler.py
@@ -528,7 +528,7 @@
                 else:                 # line 5
                     if 1: pass        # line 6
             import dis
-            co = ireturn_example.func_code
+            co = ireturn_example.__code__
             linestarts = list(dis.findlinestarts(co))
             addrreturn = linestarts[-1][0]
             x = [addrreturn == (len(co.co_code) - 4)]
diff --git a/pypy/module/__builtin__/test/test_descriptor.py b/pypy/module/__builtin__/test/test_descriptor.py
--- a/pypy/module/__builtin__/test/test_descriptor.py
+++ b/pypy/module/__builtin__/test/test_descriptor.py
@@ -259,10 +259,10 @@
         assert ff.__get__(0, int)(42) == (int, 42)
         assert ff.__get__(0)(42) == (int, 42)
 
-        assert C.goo.im_self is C
-        assert D.goo.im_self is D
-        assert super(D,D).goo.im_self is D
-        assert super(D,d).goo.im_self is D
+        assert C.goo.__self__ is C
+        assert D.goo.__self__ is D
+        assert super(D,D).goo.__self__ is D
+        assert super(D,d).goo.__self__ is D
         assert super(D,D).goo() == (D,)
         assert super(D,d).goo() == (D,)