[pypy-commit] pypy py3k: kill the rest of our Wrappables

[pjenvey]

Author: Philip Jenvey <pjenvey at underboss.org>
Branch: py3k
Changeset: r62780:af69d35c9743
Date: 2013-03-25 18:11 -0700
http://bitbucket.org/pypy/pypy/changeset/af69d35c9743/

Log:	kill the rest of our Wrappables

diff --git a/pypy/module/array/interp_array.py b/pypy/module/array/interp_array.py
--- a/pypy/module/array/interp_array.py
+++ b/pypy/module/array/interp_array.py
@@ -4,7 +4,7 @@
 from pypy.interpreter.error import OperationError
 from pypy.interpreter.gateway import interp2app, unwrap_spec
 from pypy.interpreter.typedef import GetSetProperty, make_weakref_descr, TypeDef
-from pypy.interpreter.baseobjspace import Wrappable
+from pypy.interpreter.baseobjspace import W_Root
 from pypy.objspace.std.model import W_Object
 from pypy.objspace.std.multimethod import FailedToImplement
 from pypy.objspace.std.stdtypedef import SMM, StdTypeDef
@@ -177,7 +177,7 @@
         return self.array._charbuf_start()
 
 
-class ArrayIterator(Wrappable):
+class ArrayIterator(W_Root):
     def __init__(self, array):
         self.index = 0
         self.array = array
diff --git a/pypy/module/cpyext/classobject.py b/pypy/module/cpyext/classobject.py
--- a/pypy/module/cpyext/classobject.py
+++ b/pypy/module/cpyext/classobject.py
@@ -1,13 +1,13 @@
 from rpython.rtyper.lltypesystem import rffi, lltype
 from pypy.module.cpyext.api import cpython_api, CANNOT_FAIL
 from pypy.module.cpyext.pyobject import PyObject
-from pypy.interpreter.baseobjspace import Wrappable
+from pypy.interpreter.baseobjspace import W_Root
 from pypy.interpreter.function import Method
 from pypy.interpreter.typedef import TypeDef, interp_attrproperty_w
 from pypy.interpreter.gateway import interp2app
 
 
-class InstanceMethod(Wrappable):
+class InstanceMethod(W_Root):
     """The instancemethod facade."""
     _immutable_fields_ = ['w_function']
 
diff --git a/pypy/module/thread/os_lock.py b/pypy/module/thread/os_lock.py
--- a/pypy/module/thread/os_lock.py
+++ b/pypy/module/thread/os_lock.py
@@ -156,7 +156,7 @@
     return space.wrap(Lock(space))
 
 
-class W_RLock(Wrappable):
+class W_RLock(W_Root):
     def __init__(self, space):
         self.rlock_count = 0
         self.rlock_owner = 0