Author: Armin Rigo <ar...@tunes.org>
Branch: py3.5-newtext
Changeset: r90118:b39d70ae1e8e
Date: 2017-02-14 17:43 +0100
http://bitbucket.org/pypy/pypy/changeset/b39d70ae1e8e/
Log: hg merge 111d8e1779ff
diff --git a/pypy/module/cpyext/bytearrayobject.py
b/pypy/module/cpyext/bytearrayobject.py
--- a/pypy/module/cpyext/bytearrayobject.py
+++ b/pypy/module/cpyext/bytearrayobject.py
@@ -83,7 +83,7 @@
space.call_method(w_obj, 'extend', space.newbytes('\x00' * (newlen
- oldlen)))
elif oldlen > newlen:
assert newlen >= 0
- space.delslice(w_obj, space.wrap(newlen), space.wrap(oldlen))
+ space.delslice(w_obj, space.newint(newlen), space.newint(oldlen))
return 0
else:
raise oefmt(space.w_TypeError,
diff --git a/pypy/module/cpyext/mapping.py b/pypy/module/cpyext/mapping.py
--- a/pypy/module/cpyext/mapping.py
+++ b/pypy/module/cpyext/mapping.py
@@ -44,14 +44,14 @@
def PyMapping_GetItemString(space, w_obj, key):
"""Return element of o corresponding to the object key or NULL on failure.
This is the equivalent of the Python expression o[key]."""
- w_key = space.wrap(rffi.charp2str(key))
+ w_key = space.newtext(rffi.charp2str(key))
return space.getitem(w_obj, w_key)
@cpython_api([PyObject, CONST_STRING, PyObject], rffi.INT_real, error=-1)
def PyMapping_SetItemString(space, w_obj, key, w_value):
"""Map the object key to the value v in object o. Returns -1 on failure.
This is the equivalent of the Python statement o[key] = v."""
- w_key = space.wrap(rffi.charp2str(key))
+ w_key = space.newtext(rffi.charp2str(key))
space.setitem(w_obj, w_key, w_value)
return 0
@@ -72,7 +72,7 @@
This is equivalent to o[key], returning True on success and False
on an exception. This function always succeeds."""
try:
- w_key = space.wrap(rffi.charp2str(key))
+ w_key = space.newtext(rffi.charp2str(key))
space.getitem(w_obj, w_key)
return 1
except:
diff --git a/pypy/module/cpyext/pytraceback.py
b/pypy/module/cpyext/pytraceback.py
--- a/pypy/module/cpyext/pytraceback.py
+++ b/pypy/module/cpyext/pytraceback.py
@@ -35,9 +35,9 @@
if traceback.next is None:
w_next_traceback = None
else:
- w_next_traceback = space.wrap(traceback.next)
+ w_next_traceback = traceback.next
py_traceback.c_tb_next = rffi.cast(PyTracebackObject, make_ref(space,
w_next_traceback))
- py_traceback.c_tb_frame = rffi.cast(PyFrameObject, make_ref(space,
space.wrap(traceback.frame)))
+ py_traceback.c_tb_frame = rffi.cast(PyFrameObject, make_ref(space,
traceback.frame))
rffi.setintfield(py_traceback, 'c_tb_lasti', traceback.lasti)
rffi.setintfield(py_traceback, 'c_tb_lineno',traceback.get_lineno())
diff --git a/pypy/module/cpyext/typeobject.py b/pypy/module/cpyext/typeobject.py
--- a/pypy/module/cpyext/typeobject.py
+++ b/pypy/module/cpyext/typeobject.py
@@ -61,7 +61,7 @@
tag="cpyext_1")
def PyDescr_NewGetSet(space, getset, w_type):
- return space.wrap(W_GetSetPropertyEx(getset, w_type))
+ return W_GetSetPropertyEx(getset, w_type)
def make_GetSet(space, getsetprop):
py_getsetdef = lltype.malloc(PyGetSetDef, flavor='raw')
@@ -244,7 +244,7 @@
if not name:
break
name = rffi.charp2str(name)
- w_descr = space.wrap(W_MemberDescr(member, w_type))
+ w_descr = W_MemberDescr(member, w_type)
dict_w[name] = w_descr
i += 1
@@ -356,9 +356,9 @@
continue
w_obj = W_PyCWrapperObject(space, pto, method_name, wrapper_func,
wrapper_func_kwds, doc, func_voidp, offset=offset)
- dict_w[method_name] = space.wrap(w_obj)
+ dict_w[method_name] = w_obj
if pto.c_tp_doc:
- dict_w['__doc__'] = space.newbytes(
+ dict_w['__doc__'] = space.newtext(
rffi.charp2str(cts.cast('char*', pto.c_tp_doc)))
if pto.c_tp_new:
add_tp_new_wrapper(space, dict_w, pto)
@@ -502,7 +502,7 @@
elif pto.c_tp_as_mapping and pto.c_tp_as_mapping.c_mp_subscript:
self.flag_map_or_seq = 'M'
if pto.c_tp_doc:
- self.w_doc = space.newbytes(
+ self.w_doc = space.newtext(
rffi.charp2str(cts.cast('char*', pto.c_tp_doc)))
@bootstrap_function
@@ -641,7 +641,7 @@
# point we might get into troubles by doing make_ref() when
# things are not initialized yet. So in this case, simply use
# str2charp() and "leak" the string.
- w_typename = space.getattr(w_type, space.wrap('__name__'))
+ w_typename = space.getattr(w_type, space.newtext('__name__'))
heaptype = cts.cast('PyHeapTypeObject*', pto)
heaptype.c_ht_name = make_ref(space, w_typename)
from pypy.module.cpyext.unicodeobject import PyUnicode_AsUTF8
diff --git a/pypy/module/cpyext/unicodeobject.py
b/pypy/module/cpyext/unicodeobject.py
--- a/pypy/module/cpyext/unicodeobject.py
+++ b/pypy/module/cpyext/unicodeobject.py
@@ -416,7 +416,7 @@
is NULL."""
if wchar_p:
s = rffi.wcharpsize2unicode(wchar_p, length)
- return make_ref(space, space.wrap(s))
+ return make_ref(space, space.newunicode(s))
else:
return new_empty_unicode(space, length)
@@ -442,7 +442,7 @@
# This tracks CPython 2.7, in CPython 3.4 'utf-8' is hardcoded instead
encoding = PyUnicode_GetDefaultEncoding(space)
w_str = space.newbytes(rffi.charpsize2str(s, size))
- w_encoding = space.wrap(rffi.charp2str(encoding))
+ w_encoding = space.newtext(rffi.charp2str(encoding))
if errors:
w_errors = space.newbytes(rffi.charp2str(errors))
else:
@@ -848,7 +848,7 @@
if decimal >= 0:
ch = unichr(ord('0') + decimal)
result.append(ch)
- return space.wrap(result.build())
+ return space.newunicode(result.build())
@cpython_api([PyObject, PyObject], rffi.INT_real, error=-2)
def PyUnicode_Compare(space, w_left, w_right):
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
