Author: mattip <[email protected]>
Branch:
Changeset: r83239:4ccaea59116d
Date: 2016-03-16 19:23 +0200
http://bitbucket.org/pypy/pypy/changeset/4ccaea59116d/
Log: fix properly (amaury) (grafted from
68a119b4877f6ec2890600ecba5a8b64c17025f8)
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
@@ -137,7 +137,7 @@
from pypy.module.cpyext.unicodeobject import (
PyUnicode_Check, _PyUnicode_AsDefaultEncodedString)
if PyUnicode_Check(space, ref):
- ref = _PyUnicode_AsDefaultEncodedString(space, ref, None)
+ ref = _PyUnicode_AsDefaultEncodedString(space, ref,
lltype.nullptr(rffi.CCHARP.TO))
else:
raise oefmt(space.w_TypeError,
"expected string or Unicode object, %T found",
@@ -156,7 +156,7 @@
from pypy.module.cpyext.unicodeobject import (
PyUnicode_Check, _PyUnicode_AsDefaultEncodedString)
if PyUnicode_Check(space, ref):
- ref = _PyUnicode_AsDefaultEncodedString(space, ref, None)
+ ref = _PyUnicode_AsDefaultEncodedString(space, ref,
lltype.nullptr(rffi.CCHARP.TO))
else:
raise oefmt(space.w_TypeError,
"expected string or Unicode object, %T found",
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
