[pypy-commit] pypy py3.5-newtext: hg merge 511d80a64542

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: py3.5-newtext
Changeset: r90131:8d50fdd3bda5
Date: 2017-02-14 19:01 +0100
http://bitbucket.org/pypy/pypy/changeset/8d50fdd3bda5/

Log:	hg merge 511d80a64542

diff --git a/pypy/module/_md5/interp_md5.py b/pypy/module/_md5/interp_md5.py
--- a/pypy/module/_md5/interp_md5.py
+++ b/pypy/module/_md5/interp_md5.py
@@ -23,7 +23,7 @@
         return self.space.newbytes(self.digest())
 
     def hexdigest_w(self):
-        return self.space.wrap(self.hexdigest())
+        return self.space.newtext(self.hexdigest())
 
     def copy_w(self):
         clone = W_MD5(self.space)
diff --git a/pypy/module/cppyy/interp_cppyy.py b/pypy/module/cppyy/interp_cppyy.py
--- a/pypy/module/cppyy/interp_cppyy.py
+++ b/pypy/module/cppyy/interp_cppyy.py
@@ -70,7 +70,7 @@
         nullarr = arr.fromaddress(space, rffi.cast(rffi.ULONG, 0), 0)
         assert isinstance(nullarr, W_ArrayInstance)
         nullarr.free(space)
-        state.w_nullptr = space.wrap(nullarr)
+        state.w_nullptr = nullarr
     return state.w_nullptr
 
 @unwrap_spec(name=str)
@@ -1092,7 +1092,7 @@
 
     def _get_as_builtin(self):
         try:
-            return self.space.call_method(self.space.wrap(self), "_cppyy_as_builtin")
+            return self.space.call_method(self, "_cppyy_as_builtin")
         except OperationError as e:
             if not (e.match(self.space, self.space.w_TypeError) or
                     e.match(self.space, self.space.w_AttributeError)):
diff --git a/pypy/module/pypyjit/__init__.py b/pypy/module/pypyjit/__init__.py
--- a/pypy/module/pypyjit/__init__.py
+++ b/pypy/module/pypyjit/__init__.py
@@ -39,5 +39,5 @@
         space = self.space
         pypyjitdriver.space = space
         w_obj = space.wrap(PARAMETERS)
-        space.setattr(space.wrap(self), space.wrap('defaults'), w_obj)
+        space.setattr(self, space.newtext('defaults'), w_obj)
         pypy_hooks.space = space