Author: fijal
Branch: unicode-utf8
Changeset: r90355:646678d11ad8
Date: 2017-02-25 16:27 +0100
http://bitbucket.org/pypy/pypy/changeset/646678d11ad8/
Log: fix
diff --git a/pypy/objspace/std/unicodeobject.py
b/pypy/objspace/std/unicodeobject.py
--- a/pypy/objspace/std/unicodeobject.py
+++ b/pypy/objspace/std/unicodeobject.py
@@ -136,14 +136,17 @@
@staticmethod
def _op_val(space, w_other, strict=None):
- return W_UnicodeObject.convert_arg_to_w_unicode(space,
w_other)._utf8.decode('utf8')
+ return W_UnicodeObject.convert_arg_to_w_unicode(space, w_other,
strict)._utf8.decode('utf8')
@staticmethod
- def convert_arg_to_w_unicode(space, w_other):
+ def convert_arg_to_w_unicode(space, w_other, strict=None):
if isinstance(w_other, W_UnicodeObject):
return w_other
if space.isinstance_w(w_other, space.w_bytes):
return unicode_from_string(space, w_other)
+ if strict:
+ raise oefmt(space.w_TypeError,
+ "%s arg must be None, unicode or str", strict)
return unicode_from_encoded_object(space, w_other, None, "strict")
def convert_to_w_unicode(self, space):
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
