[pypy-commit] pypy py3.5: translation fix: remove decode call to type(...).name

plan_rich pypy.commits at gmail.com
Tue Oct 18 04:48:21 EDT 2016


Author: Richard Plangger <planrichi at gmail.com>
Branch: py3.5
Changeset: r87855:3253f05f8a2b
Date: 2016-10-18 10:46 +0200
http://bitbucket.org/pypy/pypy/changeset/3253f05f8a2b/

Log:	translation fix: remove decode call to type(...).name

diff --git a/pypy/interpreter/baseobjspace.py b/pypy/interpreter/baseobjspace.py
--- a/pypy/interpreter/baseobjspace.py
+++ b/pypy/interpreter/baseobjspace.py
@@ -297,7 +297,7 @@
         if space.is_w(space.type(w_result), space.w_int):
             return w_result
         if space.isinstance_w(w_result, space.w_int):
-            tp = space.type(w_result).name.decode('utf-8')
+            tp = space.type(w_result).name
             space.warn(space.wrap(
                 "__int__ returned non-int (type %s).  "
                 "The ability to return an instance of a strict subclass of int "
diff --git a/pypy/objspace/descroperation.py b/pypy/objspace/descroperation.py
--- a/pypy/objspace/descroperation.py
+++ b/pypy/objspace/descroperation.py
@@ -483,7 +483,7 @@
         if space.is_w(space.type(w_result), space.w_int):
             return w_result
         if space.isinstance_w(w_result, space.w_int):
-            tp = space.type(w_result).name.decode('utf-8')
+            tp = space.type(w_result).name
             space.warn(space.wrap(
                 "__index__ returned non-int (type %s).  "
                 "The ability to return an instance of a strict subclass of int "


More information about the pypy-commit mailing list