Author: Armin Rigo <[email protected]>
Branch: py3.5-newtext
Changeset: r90156:426af1de6a1b
Date: 2017-02-15 17:59 +0100
http://bitbucket.org/pypy/pypy/changeset/426af1de6a1b/
Log: Some remaining space.wrap(), found by running test_ztranslation
diff --git a/pypy/interpreter/pycode.py b/pypy/interpreter/pycode.py
--- a/pypy/interpreter/pycode.py
+++ b/pypy/interpreter/pycode.py
@@ -102,7 +102,7 @@
self.co_code = code
self.co_consts_w = consts
self.co_names_w = [
- space.new_interned_w_str(space.wrap(aname.decode('utf-8')))
+ space.new_interned_w_str(space.newtext(aname))
for aname in names]
self.co_varnames = varnames
self.co_freevars = freevars
diff --git a/pypy/interpreter/typedef.py b/pypy/interpreter/typedef.py
--- a/pypy/interpreter/typedef.py
+++ b/pypy/interpreter/typedef.py
@@ -530,7 +530,7 @@
return space.newint(code.signature().num_argnames())
def fget_zero(space, code):
- return space.wrap(0)
+ return space.newint(0)
def fget_co_flags(space, code): # unwrapping through unwrap_spec
sig = code.signature()
diff --git a/pypy/interpreter/unicodehelper.py
b/pypy/interpreter/unicodehelper.py
--- a/pypy/interpreter/unicodehelper.py
+++ b/pypy/interpreter/unicodehelper.py
@@ -30,11 +30,11 @@
def raise_unicode_exception_encode(errors, encoding, msg, u,
startingpos, endingpos):
raise OperationError(space.w_UnicodeEncodeError,
- space.newtuple([space.wrap(encoding),
- space.wrap(u),
- space.wrap(startingpos),
- space.wrap(endingpos),
- space.wrap(msg)]))
+ space.newtuple([space.newtext(encoding),
+ space.newunicode(u),
+ space.newint(startingpos),
+ space.newint(endingpos),
+ space.newtext(msg)]))
return raise_unicode_exception_encode
class RUnicodeEncodeError(Exception):
@@ -82,8 +82,8 @@
from pypy.module.sys.interp_encoding import getfilesystemencoding
return space.call_method(w_string, 'decode',
getfilesystemencoding(space),
- space.wrap('surrogateescape'))
- return space.wrap(uni)
+ space.newtext('surrogateescape'))
+ return space.newunicode(uni)
def fsencode(space, w_uni):
state = space.fromcache(interp_codecs.CodecState)
@@ -113,7 +113,7 @@
from pypy.module.sys.interp_encoding import getfilesystemencoding
return space.call_method(w_uni, 'encode',
getfilesystemencoding(space),
- space.wrap('surrogateescape'))
+ space.newtext('surrogateescape'))
return space.newbytes(bytes)
def encode(space, w_data, encoding=None, errors='strict'):
diff --git a/pypy/module/_cffi_backend/cbuffer.py
b/pypy/module/_cffi_backend/cbuffer.py
--- a/pypy/module/_cffi_backend/cbuffer.py
+++ b/pypy/module/_cffi_backend/cbuffer.py
@@ -50,7 +50,7 @@
return self.buffer
def descr_len(self, space):
- return space.wrap(self.buffer.getlength())
+ return space.newint(self.buffer.getlength())
def descr_getitem(self, space, w_index):
start, stop, step, size = space.decode_index4(w_index,
diff --git a/pypy/module/_codecs/locale.py b/pypy/module/_codecs/locale.py
--- a/pypy/module/_codecs/locale.py
+++ b/pypy/module/_codecs/locale.py
@@ -58,7 +58,7 @@
errorpos = rffi.cast(lltype.Signed, errorposp[0])
if errorpos == -1:
raise MemoryError
- errmsg = _errmsg(u"pypy_wchar2char")
+ errmsg = _errmsg("pypy_wchar2char")
errorhandler('strict', 'filesystemencoding', errmsg, u,
errorpos, errorpos + 1)
return rffi.charp2str(sbuf)
@@ -81,7 +81,7 @@
ubuf = pypy_char2wchar(sbuf, sizep)
try:
if not ubuf:
- errmsg = _errmsg(u"pypy_char2wchar")
+ errmsg = _errmsg("pypy_char2wchar")
errorhandler('strict', 'filesystemencoding', errmsg, s, 0, 1)
size = rffi.cast(lltype.Signed, sizep[0])
return rawwcharp2unicoden(ubuf, size)
@@ -91,7 +91,7 @@
def _errmsg(what):
# I *think* that the functions in locale_codec.c don't set errno
- return u"%s failed" % what
+ return "%s failed" % what
class scoped_unicode2rawwcharp:
diff --git a/pypy/module/_io/interp_bytesio.py
b/pypy/module/_io/interp_bytesio.py
--- a/pypy/module/_io/interp_bytesio.py
+++ b/pypy/module/_io/interp_bytesio.py
@@ -59,7 +59,7 @@
def descr_new(space, w_subtype, __args__):
self = space.allocate_instance(W_BytesIO, w_subtype)
W_BytesIO.__init__(self, space)
- return space.wrap(self)
+ return self
def descr_init(self, space, w_initial_bytes=None):
self.init()
@@ -125,7 +125,7 @@
def getbuffer_w(self, space):
self._check_closed(space)
- return space.wrap(W_MemoryView(BytesIOBuffer(self)))
+ return W_MemoryView(BytesIOBuffer(self))
def getvalue_w(self, space):
self._check_closed(space)
diff --git a/pypy/module/_io/interp_io.py b/pypy/module/_io/interp_io.py
--- a/pypy/module/_io/interp_io.py
+++ b/pypy/module/_io/interp_io.py
@@ -23,7 +23,7 @@
W_BufferedWriter, W_BufferedReader)
if not (space.isinstance_w(w_file, space.w_unicode) or
- space.isinstance_w(w_file, space.w_str) or
+ space.isinstance_w(w_file, space.w_bytes) or
space.isinstance_w(w_file, space.w_int)):
raise oefmt(space.w_TypeError, "invalid file: %R", w_file)
@@ -88,7 +88,7 @@
"binary mode doesn't take a newline argument")
w_raw = space.call_function(
space.gettypefor(W_FileIO), w_file, space.newtext(rawmode),
- space.newbool(closefd), w_opener)
+ space.newbool(bool(closefd)), w_opener)
isatty = space.is_true(space.call_method(w_raw, "isatty"))
line_buffering = buffering == 1 or (buffering < 0 and isatty)
diff --git a/pypy/module/_io/interp_iobase.py b/pypy/module/_io/interp_iobase.py
--- a/pypy/module/_io/interp_iobase.py
+++ b/pypy/module/_io/interp_iobase.py
@@ -94,7 +94,7 @@
# the object is probably in an unusable state, so ignore.
if w_closed is not None and not space.is_true(w_closed):
try:
- self._dealloc_warn_w(space, space.wrap(self))
+ self._dealloc_warn_w(space, self)
finally:
space.call_method(self, "close")
except OperationError:
diff --git a/pypy/module/_multiprocessing/interp_semaphore.py
b/pypy/module/_multiprocessing/interp_semaphore.py
--- a/pypy/module/_multiprocessing/interp_semaphore.py
+++ b/pypy/module/_multiprocessing/interp_semaphore.py
@@ -461,7 +461,7 @@
def handle_get(self, space):
h = rffi.cast(rffi.INTPTR_T, self.handle)
- return space.wrap(h)
+ return space.newint(h)
def get_count(self, space):
return space.newint(self.count)
diff --git a/pypy/module/_posixsubprocess/interp_subprocess.py
b/pypy/module/_posixsubprocess/interp_subprocess.py
--- a/pypy/module/_posixsubprocess/interp_subprocess.py
+++ b/pypy/module/_posixsubprocess/interp_subprocess.py
@@ -220,7 +220,7 @@
if l_fds_to_keep:
lltype.free(l_fds_to_keep, flavor='raw')
- return space.wrap(pid)
+ return space.newint(pid)
def cloexec_pipe(space):
@@ -233,6 +233,6 @@
if res != 0:
raise exception_from_saved_errno(space, space.w_OSError)
- return space.newtuple([space.wrap(fds[0]),
- space.wrap(fds[1]),
+ return space.newtuple([space.newint(fds[0]),
+ space.newint(fds[1]),
])
diff --git a/pypy/module/array/reconstructor.py
b/pypy/module/array/reconstructor.py
--- a/pypy/module/array/reconstructor.py
+++ b/pypy/module/array/reconstructor.py
@@ -98,7 +98,7 @@
memstr = space.bytes_w(w_items)
step = descr.bytes
converted_items = [
- space.wrap(ieee.unpack_float(
+ space.newfloat(ieee.unpack_float(
memstr[i:i+step],
descr.big_endian))
for i in range(0, len(memstr), step)]
@@ -106,16 +106,16 @@
elif mformat_code == UTF16_LE:
w_converted_items = space.call_method(
- w_items, "decode", space.wrap("utf-16-le"))
+ w_items, "decode", space.newtext("utf-16-le"))
elif mformat_code == UTF16_BE:
w_converted_items = space.call_method(
- w_items, "decode", space.wrap("utf-16-be"))
+ w_items, "decode", space.newtext("utf-16-be"))
elif mformat_code == UTF32_LE:
w_converted_items = space.call_method(
- w_items, "decode", space.wrap("utf-32-le"))
+ w_items, "decode", space.newtext("utf-32-le"))
elif mformat_code == UTF32_BE:
w_converted_items = space.call_method(
- w_items, "decode", space.wrap("utf-32-be"))
+ w_items, "decode", space.newtext("utf-32-be"))
else:
descr = format_descriptors[mformat_code]
# If possible, try to pack array's items using a data type
diff --git a/pypy/module/imp/importing.py b/pypy/module/imp/importing.py
--- a/pypy/module/imp/importing.py
+++ b/pypy/module/imp/importing.py
@@ -88,10 +88,10 @@
source = fp.read()
pathname = "<frozen %s>" % modulename
code_w = ec.compiler.compile(source, pathname, 'exec', 0)
- w_mod = add_module(space, space.wrap(modulename))
+ w_mod = add_module(space, space.newtext(modulename))
assert isinstance(w_mod, Module) # XXX why is that necessary?
space.setitem(space.sys.get('modules'), w_mod.w_name, w_mod)
- space.setitem(w_mod.w_dict, space.wrap('__name__'), w_mod.w_name)
+ space.setitem(w_mod.w_dict, space.newtext('__name__'), w_mod.w_name)
code_w.exec_code(space, w_mod.w_dict, w_mod.w_dict)
assert check_sys_modules_w(space, modulename)
finally:
diff --git a/pypy/module/posix/interp_posix.py
b/pypy/module/posix/interp_posix.py
--- a/pypy/module/posix/interp_posix.py
+++ b/pypy/module/posix/interp_posix.py
@@ -783,7 +783,7 @@
def strerror(space, code):
"""Translate an error code to a message string."""
try:
- return space.newtext(_strerror(code))
+ return space.newunicode(_strerror(code))
except ValueError:
raise oefmt(space.w_ValueError, "strerror() argument out of range")
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
