[pypy-commit] pypy py3k: space.is_true/space.issubtype -> space.issubtype_w

[pjenvey]

Author: Philip Jenvey <pjenvey at underboss.org>
Branch: py3k
Changeset: r84582:840c490bfb73
Date: 2016-05-22 11:21 -0700
http://bitbucket.org/pypy/pypy/changeset/840c490bfb73/

Log:	space.is_true/space.issubtype -> space.issubtype_w

diff --git a/pypy/objspace/descroperation.py b/pypy/objspace/descroperation.py
--- a/pypy/objspace/descroperation.py
+++ b/pypy/objspace/descroperation.py
@@ -582,7 +582,7 @@
             # if the type is the same, then don't reverse: try
             # left first, right next.
             pass
-        elif space.is_true(space.issubtype(w_typ2, w_typ1)):
+        elif space.issubtype_w(w_typ2, w_typ1):
             # if typ2 is a subclass of typ1.
             w_obj1, w_obj2 = w_obj2, w_obj1
             w_left_impl, w_right_impl = w_right_impl, w_left_impl
diff --git a/pypy/objspace/std/dictproxyobject.py b/pypy/objspace/std/dictproxyobject.py
--- a/pypy/objspace/std/dictproxyobject.py
+++ b/pypy/objspace/std/dictproxyobject.py
@@ -50,7 +50,7 @@
     def getitem(self, w_dict, w_key):
         space = self.space
         w_lookup_type = space.type(w_key)
-        if space.is_true(space.issubtype(w_lookup_type, space.w_unicode)):
+        if space.issubtype_w(w_lookup_type, space.w_unicode):
             return self.getitem_str(w_dict, space.str_w(w_key))
         else:
             return None
diff --git a/pypy/objspace/std/typeobject.py b/pypy/objspace/std/typeobject.py
--- a/pypy/objspace/std/typeobject.py
+++ b/pypy/objspace/std/typeobject.py
@@ -710,9 +710,9 @@
     w_winner = w_metaclass
     for base in bases_w:
         w_typ = space.type(base)
-        if space.is_true(space.issubtype(w_winner, w_typ)):
+        if space.issubtype_w(w_winner, w_typ):
             continue
-        if space.is_true(space.issubtype(w_typ, w_winner)):
+        if space.issubtype_w(w_typ, w_winner):
             w_winner = w_typ
             continue
         msg = ("metaclass conflict: the metaclass of a derived class must be "