Author: Armin Rigo <ar...@tunes.org> Branch: Changeset: r87864:9d625b0651c8 Date: 2016-10-18 20:55 +0200 http://bitbucket.org/pypy/pypy/changeset/9d625b0651c8/
Log: Backed out changeset 26574d11afdb Misdirected usage of newbytes(): on PyPy3 we don't want a bytes object, we want a str object (i.e. unicode) diff --git a/pypy/module/cpyext/pyerrors.py b/pypy/module/cpyext/pyerrors.py --- a/pypy/module/cpyext/pyerrors.py +++ b/pypy/module/cpyext/pyerrors.py @@ -21,7 +21,7 @@ @cpython_api([PyObject, CONST_STRING], lltype.Void) def PyErr_SetString(space, w_type, message_ptr): message = rffi.charp2str(message_ptr) - PyErr_SetObject(space, w_type, space.newbytes(message)) + PyErr_SetObject(space, w_type, space.wrap(message)) @cpython_api([PyObject], lltype.Void, error=CANNOT_FAIL) def PyErr_SetNone(space, w_type): @@ -151,7 +151,7 @@ # XXX Doesn't actually do anything with PyErr_CheckSignals. if llfilename: filename = rffi.charp2str(llfilename) - w_filename = space.newbytes(filename) + w_filename = space.wrap(filename) else: w_filename = space.w_None @@ -170,13 +170,13 @@ msg = os.strerror(errno) if w_value: w_error = space.call_function(w_type, - space.newint(errno), - space.newbytes(msg), + space.wrap(errno), + space.wrap(msg), w_value) else: w_error = space.call_function(w_type, - space.newint(errno), - space.newbytes(msg)) + space.wrap(errno), + space.wrap(msg)) raise OperationError(w_type, w_error) @cpython_api([], rffi.INT_real, error=-1) @@ -252,11 +252,11 @@ documentation. There is no C API for warning control.""" if w_category is None: w_category = space.w_None - w_message = space.newbytes(rffi.charp2str(message_ptr)) - w_stacklevel = space.newint(rffi.cast(lltype.Signed, stacklevel)) + w_message = space.wrap(rffi.charp2str(message_ptr)) + w_stacklevel = space.wrap(rffi.cast(lltype.Signed, stacklevel)) - w_module = PyImport_Import(space, space.newbytes("warnings")) - w_warn = space.getattr(w_module, space.newbytes("warn")) + w_module = PyImport_Import(space, space.wrap("warnings")) + w_warn = space.getattr(w_module, space.wrap("warn")) space.call_function(w_warn, w_message, w_category, w_stacklevel) return 0 @@ -317,10 +317,10 @@ @cpython_api([PyObject, PyObject], rffi.INT_real, error=-1) def PyTraceBack_Print(space, w_tb, w_file): - space.call_method(w_file, "write", space.newbytes( + space.call_method(w_file, "write", space.wrap( 'Traceback (most recent call last):\n')) w_traceback = space.call_method(space.builtin, '__import__', - space.newbytes("traceback")) + space.wrap("traceback")) space.call_method(w_traceback, "print_tb", w_tb, space.w_None, w_file) return 0 _______________________________________________ pypy-commit mailing list pypy-commit@python.org https://mail.python.org/mailman/listinfo/pypy-commit