[pypy-commit] pypy space-newtext: various fixes
cfbolz
pypy.commits at gmail.com
Wed Nov 9 07:37:58 EST 2016
Author: Carl Friedrich Bolz <cfbolz at gmx.de>
Branch: space-newtext
Changeset: r88260:bfc7301d9344
Date: 2016-11-08 14:24 +0100
http://bitbucket.org/pypy/pypy/changeset/bfc7301d9344/
Log: various fixes
diff --git a/pypy/module/_codecs/interp_codecs.py b/pypy/module/_codecs/interp_codecs.py
--- a/pypy/module/_codecs/interp_codecs.py
+++ b/pypy/module/_codecs/interp_codecs.py
@@ -478,7 +478,7 @@
res, consumed, byteorder = runicode.str_decode_utf_16_helper(
data, len(data), errors, final, state.decode_error_handler, byteorder)
return space.newtuple([space.newunicode(res), space.newint(consumed),
- space.newtext(byteorder)])
+ space.newint(byteorder)])
@unwrap_spec(data='bufferstr', errors='str_or_None', byteorder=int,
w_final=WrappedDefault(False))
@@ -497,7 +497,7 @@
res, consumed, byteorder = runicode.str_decode_utf_32_helper(
data, len(data), errors, final, state.decode_error_handler, byteorder)
return space.newtuple([space.newunicode(res), space.newint(consumed),
- space.newtext(byteorder)])
+ space.newint(byteorder)])
# ____________________________________________________________
# Charmap
diff --git a/pypy/module/_csv/interp_csv.py b/pypy/module/_csv/interp_csv.py
--- a/pypy/module/_csv/interp_csv.py
+++ b/pypy/module/_csv/interp_csv.py
@@ -22,7 +22,7 @@
]
def _fetch(space, w_dialect, name):
- return space.findattr(w_dialect, space.wrap(name))
+ return space.findattr(w_dialect, space.newtext(name))
def _get_bool(space, w_src, default):
if w_src is None:
@@ -134,7 +134,7 @@
w_escapechar, w_lineterminator, w_quotechar,
w_quoting, w_skipinitialspace, w_strict)
if space.is_w(w_subtype, space.gettypeobject(W_Dialect.typedef)):
- return space.wrap(dialect)
+ return dialect
else:
subdialect = space.allocate_instance(W_Dialect, w_subtype)
subdialect.delimiter = dialect.delimiter
@@ -145,18 +145,18 @@
subdialect.quoting = dialect.quoting
subdialect.skipinitialspace = dialect.skipinitialspace
subdialect.strict = dialect.strict
- return space.wrap(subdialect)
+ return subdialect
def _get_escapechar(space, dialect):
if dialect.escapechar == '\0':
return space.w_None
- return space.wrap(dialect.escapechar)
+ return space.newtext(dialect.escapechar)
def _get_quotechar(space, dialect):
if dialect.quotechar == '\0':
return space.w_None
- return space.wrap(dialect.quotechar)
+ return space.newtext(dialect.quotechar)
W_Dialect.typedef = TypeDef(
diff --git a/pypy/module/_csv/interp_writer.py b/pypy/module/_csv/interp_writer.py
--- a/pypy/module/_csv/interp_writer.py
+++ b/pypy/module/_csv/interp_writer.py
@@ -13,7 +13,7 @@
def __init__(self, space, dialect, w_fileobj):
self.space = space
self.dialect = dialect
- self.w_filewrite = space.getattr(w_fileobj, space.wrap('write'))
+ self.w_filewrite = space.getattr(w_fileobj, space.newtext('write'))
# precompute this
special = dialect.delimiter + dialect.lineterminator
if dialect.escapechar != '\0':
@@ -26,8 +26,8 @@
def error(self, msg):
space = self.space
w_module = space.getbuiltinmodule('_csv')
- w_error = space.getattr(w_module, space.wrap('Error'))
- raise OperationError(w_error, space.wrap(msg))
+ w_error = space.getattr(w_module, space.newtext('Error'))
+ raise OperationError(w_error, space.newtext(msg))
def writerow(self, w_fields):
"""Construct and write a CSV record from a sequence of fields.
@@ -115,7 +115,7 @@
rec.append(dialect.lineterminator)
line = rec.build()
- return space.call_function(self.w_filewrite, space.wrap(line))
+ return space.call_function(self.w_filewrite, space.newtext(line))
def writerows(self, w_seqseq):
"""Construct and write a series of sequences to a csv file.
diff --git a/pypy/module/_demo/demo.py b/pypy/module/_demo/demo.py
--- a/pypy/module/_demo/demo.py
+++ b/pypy/module/_demo/demo.py
@@ -15,7 +15,7 @@
def get(space, name):
w_module = space.getbuiltinmodule('_demo')
- return space.getattr(w_module, space.wrap(name))
+ return space.getattr(w_module, space.newtext(name))
@unwrap_spec(repetitions=int)
@@ -27,7 +27,7 @@
for i in range(repetitions):
space.call_function(w_callable)
endtime = time(0)
- return space.wrap(endtime - starttime)
+ return space.newint(endtime - starttime)
@unwrap_spec(n=int)
def sieve(space, n):
@@ -55,10 +55,10 @@
def multiply(self, w_y):
space = self.space
y = space.int_w(w_y)
- return space.wrap(self.x * y)
+ return space.newint(self.x * y)
def fget_x(self, space):
- return space.wrap(self.x)
+ return space.newint(self.x)
def fset_x(self, space, w_value):
self.x = space.int_w(w_value)
@@ -66,8 +66,8 @@
@unwrap_spec(x=int)
def mytype_new(space, w_subtype, x):
if x == 3:
- return space.wrap(MySubType(space, x))
- return space.wrap(W_MyType(space, x))
+ return MySubType(space, x)
+ return W_MyType(space, x)
getset_x = GetSetProperty(W_MyType.fget_x, W_MyType.fset_x, cls=W_MyType)
diff --git a/pypy/module/_md5/__init__.py b/pypy/module/_md5/__init__.py
--- a/pypy/module/_md5/__init__.py
+++ b/pypy/module/_md5/__init__.py
@@ -21,7 +21,7 @@
interpleveldefs = {
'new': 'interp_md5.W_MD5',
'MD5Type': 'interp_md5.W_MD5',
- 'digest_size': 'space.wrap(16)',
+ 'digest_size': 'space.newint(16)',
}
appleveldefs = {
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
@@ -28,7 +28,7 @@
def copy_w(self):
clone = W_MD5(self.space)
clone._copyfrom(self)
- return self.space.wrap(clone)
+ return clone
@unwrap_spec(initialdata='bufferstr')
diff --git a/pypy/module/_multiprocessing/interp_memory.py b/pypy/module/_multiprocessing/interp_memory.py
--- a/pypy/module/_multiprocessing/interp_memory.py
+++ b/pypy/module/_multiprocessing/interp_memory.py
@@ -7,7 +7,7 @@
if space.config.objspace.usemodules.mmap:
mmap = space.interp_w(W_MMap, w_obj)
address = rffi.cast(rffi.SIZE_T, mmap.mmap.data)
- return space.newtuple([space.wrap(address),
- space.wrap(mmap.mmap.size)])
+ return space.newtuple([space.newint(address),
+ space.newint(mmap.mmap.size)])
else:
raise oefmt(space.w_TypeError, "cannot get address of buffer")
diff --git a/pypy/module/_sha/__init__.py b/pypy/module/_sha/__init__.py
--- a/pypy/module/_sha/__init__.py
+++ b/pypy/module/_sha/__init__.py
@@ -21,9 +21,9 @@
interpleveldefs = {
'new': 'interp_sha.W_SHA',
'SHAType': 'interp_sha.W_SHA',
- 'blocksize': 'space.wrap(1)',
- 'digest_size': 'space.wrap(20)',
- 'digestsize': 'space.wrap(20)',
+ 'blocksize': 'space.newint(1)',
+ 'digest_size': 'space.newint(20)',
+ 'digestsize': 'space.newint(20)',
}
appleveldefs = {
diff --git a/pypy/module/_sre/__init__.py b/pypy/module/_sre/__init__.py
--- a/pypy/module/_sre/__init__.py
+++ b/pypy/module/_sre/__init__.py
@@ -6,9 +6,9 @@
}
interpleveldefs = {
- 'CODESIZE': 'space.wrap(interp_sre.CODESIZE)',
+ 'CODESIZE': 'space.newint(interp_sre.CODESIZE)',
'MAGIC': 'space.newint(20031017)',
- 'MAXREPEAT': 'space.wrap(interp_sre.MAXREPEAT)',
+ 'MAXREPEAT': 'space.newint(interp_sre.MAXREPEAT)',
'compile': 'interp_sre.W_SRE_Pattern',
'getlower': 'interp_sre.w_getlower',
'getcodesize': 'interp_sre.w_getcodesize',
diff --git a/pypy/module/errno/interp_errno.py b/pypy/module/errno/interp_errno.py
--- a/pypy/module/errno/interp_errno.py
+++ b/pypy/module/errno/interp_errno.py
@@ -1,5 +1,5 @@
import errno
def get_errorcode(space):
- return space.newint(errno.errorcode)
+ return space.wrap(errno.errorcode) # initializiation time
diff --git a/pypy/module/fcntl/interp_fcntl.py b/pypy/module/fcntl/interp_fcntl.py
--- a/pypy/module/fcntl/interp_fcntl.py
+++ b/pypy/module/fcntl/interp_fcntl.py
@@ -111,7 +111,7 @@
if rv < 0:
raise _get_error(space, "fcntl")
arg = rffi.charpsize2str(ll_arg, len(arg))
- return space.wrap(arg)
+ return space.newbytes(arg)
finally:
lltype.free(ll_arg, flavor='raw')
@@ -120,7 +120,7 @@
rv = fcntl_int(fd, op, intarg)
if rv < 0:
raise _get_error(space, "fcntl")
- return space.wrap(rv)
+ return space.newint(rv)
@unwrap_spec(op=int)
def flock(space, w_fd, op):
@@ -223,8 +223,8 @@
arg = rffi.charpsize2str(ll_arg, len(arg))
if mutate_flag != 0:
rwbuffer.setslice(0, arg)
- return space.wrap(rv)
- return space.wrap(arg)
+ return space.newint(rv)
+ return space.newbytes(arg)
finally:
lltype.free(ll_arg, flavor='raw')
@@ -245,7 +245,7 @@
if rv < 0:
raise _get_error(space, "ioctl")
arg = rffi.charpsize2str(ll_arg, len(arg))
- return space.wrap(arg)
+ return space.newbytes(arg)
finally:
lltype.free(ll_arg, flavor='raw')
@@ -254,4 +254,4 @@
rv = ioctl_int(fd, op, intarg)
if rv < 0:
raise _get_error(space, "ioctl")
- return space.wrap(rv)
+ return space.newint(rv)
diff --git a/pypy/module/gc/interp_gc.py b/pypy/module/gc/interp_gc.py
--- a/pypy/module/gc/interp_gc.py
+++ b/pypy/module/gc/interp_gc.py
@@ -15,7 +15,7 @@
cache = space.fromcache(MapAttrCache)
cache.clear()
rgc.collect()
- return space.wrap(0)
+ return space.newint(0)
def enable(space):
"""Non-recursive version. Enable finalizers now.
diff --git a/pypy/module/signal/interp_signal.py b/pypy/module/signal/interp_signal.py
--- a/pypy/module/signal/interp_signal.py
+++ b/pypy/module/signal/interp_signal.py
@@ -128,7 +128,7 @@
if WIN32 and signum not in signal_values:
self.handlers_w[signum] = space.w_None
else:
- self.handlers_w[signum] = space.wrap(SIG_DFL)
+ self.handlers_w[signum] = space.newint(SIG_DFL)
def _get_handlers(space):
return space.fromcache(Handlers).handlers_w
@@ -146,8 +146,8 @@
pypysig_reinstall(n)
# invoke the app-level handler
ec = space.getexecutioncontext()
- w_frame = space.wrap(ec.gettopframe_nohidden())
- space.call_function(w_handler, space.wrap(n), w_frame)
+ w_frame = ec.gettopframe_nohidden()
+ space.call_function(w_handler, space.newint(n), w_frame)
@unwrap_spec(signum=int)
@@ -179,7 +179,7 @@
@jit.dont_look_inside
@unwrap_spec(timeout=int)
def alarm(space, timeout):
- return space.wrap(c_alarm(timeout))
+ return space.newint(c_alarm(timeout))
@jit.dont_look_inside
@@ -216,9 +216,9 @@
"__pypy__.thread.enable_signals()")
check_signum_in_range(space, signum)
- if space.eq_w(w_handler, space.wrap(SIG_DFL)):
+ if space.eq_w(w_handler, space.newint(SIG_DFL)):
pypysig_default(signum)
- elif space.eq_w(w_handler, space.wrap(SIG_IGN)):
+ elif space.eq_w(w_handler, space.newint(SIG_IGN)):
pypysig_ignore(signum)
else:
if not space.is_true(space.callable(w_handler)):
@@ -252,7 +252,7 @@
if e.errno == errno.EBADF:
raise oefmt(space.w_ValueError, "invalid fd")
old_fd = pypysig_set_wakeup_fd(fd, True)
- return space.wrap(intmask(old_fd))
+ return space.newint(intmask(old_fd))
@jit.dont_look_inside
@@ -261,7 +261,7 @@
check_signum_in_range(space, signum)
if rffi.cast(lltype.Signed, c_siginterrupt(signum, flag)) < 0:
errno = rposix.get_saved_errno()
- raise OperationError(space.w_RuntimeError, space.wrap(errno))
+ raise OperationError(space.w_RuntimeError, space.newint(errno))
#__________________________________________________________
@@ -277,8 +277,8 @@
def itimer_retval(space, val):
- w_value = space.wrap(double_from_timeval(val.c_it_value))
- w_interval = space.wrap(double_from_timeval(val.c_it_interval))
+ w_value = space.newfloat(double_from_timeval(val.c_it_value))
+ w_interval = space.newfloat(double_from_timeval(val.c_it_interval))
return space.newtuple([w_value, w_interval])
diff --git a/pypy/module/thread/os_thread.py b/pypy/module/thread/os_thread.py
--- a/pypy/module/thread/os_thread.py
+++ b/pypy/module/thread/os_thread.py
@@ -189,7 +189,7 @@
raise
except rthread.error:
raise wrap_thread_error(space, "can't start new thread")
- return space.wrap(ident)
+ return space.newint(ident)
def get_ident(space):
@@ -201,7 +201,7 @@
be relied upon, and the number should be seen purely as a magic cookie.
A thread's identity may be reused for another thread after it exits."""
ident = rthread.get_ident()
- return space.wrap(ident)
+ return space.newint(ident)
@unwrap_spec(size=int)
def stack_size(space, size=0):
@@ -231,7 +231,7 @@
raise oefmt(space.w_ValueError, "size not valid: %d bytes", size)
if error == -2:
raise wrap_thread_error(space, "setting stack size not supported")
- return space.wrap(old_size)
+ return space.newint(old_size)
def _count(space):
"""_count() -> integer
@@ -242,7 +242,7 @@
This function is meant for internal and specialized purposes only.
In most applications `threading.enumerate()` should be used instead."""
- return space.wrap(bootstrapper.nbthreads)
+ return space.newint(bootstrapper.nbthreads)
def exit(space):
"""This is synonymous to ``raise SystemExit''. It will cause the current
More information about the pypy-commit
mailing list