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

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: py3.5-newtext
Changeset: r90107:ebb8f9173578
Date: 2017-02-14 11:27 +0100
http://bitbucket.org/pypy/pypy/changeset/ebb8f9173578/

Log:	hg merge e725a8848ced

diff --git a/pypy/module/_pickle_support/maker.py b/pypy/module/_pickle_support/maker.py
--- a/pypy/module/_pickle_support/maker.py
+++ b/pypy/module/_pickle_support/maker.py
@@ -15,7 +15,7 @@
 #      Stackless does use this so it might be needed here as well.
 
 def cell_new(space):
-    return space.wrap(instantiate(Cell))
+    return instantiate(Cell)
 
 def code_new(space, __args__):
     w_type = space.gettypeobject(PyCode.typedef)
@@ -24,11 +24,11 @@
 def func_new(space):
     fu = instantiate(Function)
     fu.w_func_dict = space.newdict()
-    return space.wrap(fu)
+    return fu
 
 def module_new(space, w_name, w_dict):
     new_mod = Module(space, w_name, w_dict)
-    return space.wrap(new_mod)
+    return new_mod
 
 def method_new(space, __args__):
     w_type = space.gettypeobject(Method.typedef)
@@ -44,30 +44,30 @@
 
 def frame_new(space):
     new_frame = instantiate(space.FrameClass)   # XXX fish
-    return space.wrap(new_frame)
+    return new_frame
 
 def traceback_new(space):
     tb = instantiate(PyTraceback)
-    return space.wrap(tb)
+    return tb
 
 def generator_new(space):
     new_generator = instantiate(GeneratorIterator)
-    return space.wrap(new_generator)
+    return new_generator
 
 def coroutine_new(space):
     new_coroutine = instantiate(Coroutine)
-    return space.wrap(new_coroutine)
+    return new_coroutine
 
 def longrangeiter_new(space, w_start, w_step, w_len, w_index):
     from pypy.module.__builtin__.functional import W_LongRangeIterator
     new_iter = W_LongRangeIterator(space, w_start, w_step, w_len, w_index)
-    return space.wrap(new_iter)
+    return new_iter
 
 @unwrap_spec(current=int, remaining=int, step=int)
 def intrangeiter_new(space, current, remaining, step):
     from pypy.module.__builtin__.functional import W_IntRangeIterator
     new_iter = W_IntRangeIterator(space, current, remaining, step)
-    return space.wrap(new_iter)
+    return new_iter
 
 @unwrap_spec(identifier=str)
 def builtin_code(space, identifier):
@@ -99,13 +99,12 @@
     a tuple with the positions of NULLs as first element.
     """
     tup = [None] * (len(seq_w) + 1)
-    w = space.wrap
     num = 1
     nulls = [None for i in seq_w if i is None]
     null_num = 0
     for w_obj in seq_w:
         if w_obj is None:
-            nulls[null_num] = w(num - 1)
+            nulls[null_num] = space.newint(num - 1)
             null_num += 1
             w_obj = space.w_None
         tup[num] = w_obj
diff --git a/pypy/module/struct/formatiterator.py b/pypy/module/struct/formatiterator.py
--- a/pypy/module/struct/formatiterator.py
+++ b/pypy/module/struct/formatiterator.py
@@ -148,7 +148,7 @@
         if isinstance(value, str):
             self.result_w.append(self.space.newbytes(value))
         else:
-            self.result_w.append(self.space.wrap(value))
+            self.result_w.append(self.space.wrap(value)) # YYY
 
     def get_pos(self):
         return self.pos
diff --git a/pypy/module/struct/interp_struct.py b/pypy/module/struct/interp_struct.py
--- a/pypy/module/struct/interp_struct.py
+++ b/pypy/module/struct/interp_struct.py
@@ -27,15 +27,15 @@
     try:
         fmtiter.interpret(format)
     except StructOverflowError as e:
-        raise OperationError(space.w_OverflowError, space.wrap(e.msg))
+        raise OperationError(space.w_OverflowError, space.newtext(e.msg))
     except StructError as e:
-        raise OperationError(get_error(space), space.wrap(e.msg))
+        raise OperationError(get_error(space), space.newtext(e.msg))
     return fmtiter.totalsize
 
 
 @unwrap_spec(format=str)
 def calcsize(space, format):
-    return space.wrap(_calcsize(space, format))
+    return space.newint(_calcsize(space, format))
 
 
 def _pack(space, format, args_w):
@@ -47,9 +47,9 @@
     try:
         fmtiter.interpret(format)
     except StructOverflowError as e:
-        raise OperationError(space.w_OverflowError, space.wrap(e.msg))
+        raise OperationError(space.w_OverflowError, space.newtext(e.msg))
     except StructError as e:
-        raise OperationError(get_error(space), space.wrap(e.msg))
+        raise OperationError(get_error(space), space.newtext(e.msg))
     return fmtiter.result.build()
 
 
@@ -78,9 +78,9 @@
     try:
         fmtiter.interpret(format)
     except StructOverflowError as e:
-        raise OperationError(space.w_OverflowError, space.wrap(e.msg))
+        raise OperationError(space.w_OverflowError, space.newtext(e.msg))
     except StructError as e:
-        raise OperationError(get_error(space), space.wrap(e.msg))
+        raise OperationError(get_error(space), space.newtext(e.msg))
     return space.newtuple(fmtiter.result_w[:])