Author: Matti Picus <[email protected]>
Branch:
Changeset: r73829:b933cb080e90
Date: 2014-10-06 21:28 +0300
http://bitbucket.org/pypy/pypy/changeset/b933cb080e90/
Log: allow surrogates by default in narrow builds (windows) Note that
pypy unicodeobject calls the utf8 functions with
'allow_surrogates=True'.
diff --git a/rpython/rlib/runicode.py b/rpython/rlib/runicode.py
--- a/rpython/rlib/runicode.py
+++ b/rpython/rlib/runicode.py
@@ -8,8 +8,10 @@
if rffi.sizeof(lltype.UniChar) == 4:
MAXUNICODE = 0x10ffff
+ allow_surrogate_by_default = False
else:
MAXUNICODE = 0xffff
+ allow_surrogate_by_default = True
BYTEORDER = sys.byteorder
@@ -122,7 +124,7 @@
]
def str_decode_utf_8(s, size, errors, final=False,
- errorhandler=None, allow_surrogates=False):
+ errorhandler=None,
allow_surrogates=allow_surrogate_by_default):
if errorhandler is None:
errorhandler = default_unicode_error_decode
result = UnicodeBuilder(size)
@@ -304,7 +306,7 @@
result.append((chr((0x80 | (ch & 0x3f)))))
def unicode_encode_utf_8(s, size, errors, errorhandler=None,
- allow_surrogates=False):
+ allow_surrogates=allow_surrogate_by_default):
if errorhandler is None:
errorhandler = default_unicode_error_encode
return unicode_encode_utf_8_impl(s, size, errors, errorhandler,
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
