Author: Ronan Lamy <[email protected]>
Branch: apptest-file
Changeset: r96299:2c2298a84910
Date: 2019-03-12 18:23 +0000
http://bitbucket.org/pypy/pypy/changeset/2c2298a84910/
Log: fix merge
diff --git a/pypy/interpreter/unicodehelper.py
b/pypy/interpreter/unicodehelper.py
--- a/pypy/interpreter/unicodehelper.py
+++ b/pypy/interpreter/unicodehelper.py
@@ -6,7 +6,7 @@
from rpython.rlib import rutf8
from rpython.rlib.rarithmetic import r_uint, intmask
from rpython.rtyper.lltypesystem import rffi
-from pypy.module.unicodedata import unicodedb
+from pypy.module.unicodedata.interp_ucd import unicodedb
@specialize.memo()
def decode_error_handler(space):
@@ -233,7 +233,7 @@
slen = len(s)
res = runicode.unicode_encode_mbcs(s, slen, errors, errorhandler)
return res
-
+
def str_decode_mbcs(s, errors, final, errorhandler):
from rpython.rlib import runicode
slen = len(s)
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
