[pypy-commit] pypy default: Support for test_calling_object_init on top of pypy

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r67480:7f3f5f2569ae
Date: 2013-10-21 15:00 +0200
http://bitbucket.org/pypy/pypy/changeset/7f3f5f2569ae/

Log:	Support for test_calling_object_init on top of pypy

diff --git a/rpython/rtyper/rbuiltin.py b/rpython/rtyper/rbuiltin.py
--- a/rpython/rtyper/rbuiltin.py
+++ b/rpython/rtyper/rbuiltin.py
@@ -356,7 +356,8 @@
         getattr(WindowsError.__init__, 'im_func', WindowsError.__init__)] = (
         rtype_WindowsError__init__)
 
-BUILTIN_TYPER[object.__init__] = rtype_object__init__
+BUILTIN_TYPER[getattr(object.__init__, 'im_func', object.__init__)] = (
+    rtype_object__init__)
 # annotation of low-level types
 
 def rtype_malloc(hop, i_flavor=None, i_zero=None, i_track_allocation=None,