[pypy-commit] pypy space-newtext: remove wraps in struct module
cfbolz
pypy.commits at gmail.com
Tue Nov 1 14:34:36 EDT 2016
Author: Carl Friedrich Bolz <cfbolz at gmx.de>
Branch: space-newtext
Changeset: r88049:e725a8848ced
Date: 2016-11-01 19:04 +0100
http://bitbucket.org/pypy/pypy/changeset/e725a8848ced/
Log: remove wraps in struct module
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, add_package=False)
- return space.wrap(new_mod)
+ return new_mod
def method_new(space, __args__):
w_type = space.gettypeobject(Method.typedef)
@@ -57,21 +57,21 @@
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
@unwrap_spec(current=int, remaining=int, step=int)
def xrangeiter_new(space, current, remaining, step):
from pypy.module.__builtin__.functional import W_XRangeIterator
new_iter = W_XRangeIterator(space, current, remaining, step)
- return space.wrap(new_iter)
+ return new_iter
@unwrap_spec(identifier=str)
def builtin_code(space, identifier):
@@ -112,13 +112,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
@@ -78,7 +78,7 @@
else:
msg = "integer argument expected, got non-integer" \
" (implicit conversion using __int__ is deprecated)"
- space.warn(space.wrap(msg), space.w_DeprecationWarning)
+ space.warn(space.newtext(msg), space.w_DeprecationWarning)
w_index = space.int(w_obj) # wrapped float -> wrapped int or long
if w_index is None:
raise StructError("cannot convert argument to integer")
@@ -148,7 +148,7 @@
@specialize.argtype(1)
def appendobj(self, value):
- 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
@@ -26,15 +26,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):
@@ -46,15 +46,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.result.build()
@unwrap_spec(format=str)
def pack(space, format, args_w):
- return space.wrap(_pack(space, format, args_w))
+ return space.newbytes(_pack(space, format, args_w))
# XXX inefficient
@@ -77,9 +77,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[:])
More information about the pypy-commit
mailing list