Author: Armin Rigo <ar...@tunes.org>
Branch: space-newtext
Changeset: r90117:177cb9a0a3c2
Date: 2017-02-14 17:43 +0100
http://bitbucket.org/pypy/pypy/changeset/177cb9a0a3c2/
Log: fix some newbytes/newtext mistakes (they show up as conflicts in
case the py3.5 branch already did the replacement choosing the other
one)
diff --git a/pypy/module/cpyext/bytesobject.py
b/pypy/module/cpyext/bytesobject.py
--- a/pypy/module/cpyext/bytesobject.py
+++ b/pypy/module/cpyext/bytesobject.py
@@ -124,14 +124,14 @@
def PyString_FromStringAndSize(space, char_p, length):
if char_p:
s = rffi.charpsize2str(char_p, length)
- return make_ref(space, space.newtext(s))
+ return make_ref(space, space.newbytes(s))
else:
return rffi.cast(PyObject, new_empty_str(space, length))
@cpython_api([CONST_STRING], PyObject)
def PyString_FromString(space, char_p):
s = rffi.charp2str(char_p)
- return space.newtext(s)
+ return space.newbytes(s)
@cpython_api([PyObject], rffi.CCHARP, error=0)
def PyString_AsString(space, ref):
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
@@ -361,7 +361,7 @@
wrapper_func_kwds, doc, func_voidp, offset=offset)
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)
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
@@ -432,7 +432,7 @@
else:
path = space.str0_w(w_path)
fullpath = rposix.getfullpathname(path)
- w_fullpath = space.newtext(fullpath)
+ w_fullpath = space.newbytes(fullpath)
except OSError as e:
raise wrap_oserror2(space, e, w_path)
else:
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
