[pypy-commit] pypy py3k-update: Remove reference to old-style classes

[rlamy]

Author: Ronan Lamy <ronan.lamy at gmail.com>
Branch: py3k-update
Changeset: r84108:3e13ccbf37de
Date: 2016-05-01 21:36 +0100
http://bitbucket.org/pypy/pypy/changeset/3e13ccbf37de/

Log:	Remove reference to old-style classes

diff --git a/pypy/interpreter/typedef.py b/pypy/interpreter/typedef.py
--- a/pypy/interpreter/typedef.py
+++ b/pypy/interpreter/typedef.py
@@ -125,7 +125,6 @@
 def _getusercls(space, cls, wants_del, reallywantdict=False):
     from rpython.rlib import objectmodel
     from pypy.objspace.std.objectobject import W_ObjectObject
-    from pypy.module.__builtin__.interp_classobj import W_InstanceObject
     from pypy.objspace.std.mapdict import (BaseUserClassMapdict,
             MapdictDictSupport, MapdictWeakrefSupport,
             _make_storage_mixin_size_n, MapdictStorageMixin)
@@ -133,7 +132,7 @@
     name = cls.__name__ + "User"
 
     mixins_needed = []
-    if cls is W_ObjectObject or cls is W_InstanceObject:
+    if cls is W_ObjectObject:
         mixins_needed.append(_make_storage_mixin_size_n())
     else:
         mixins_needed.append(MapdictStorageMixin)