Author: Antonio Cuni <[email protected]>
Branch: py3k
Changeset: r57128:7edaa3448803
Date: 2012-09-04 16:31 +0200
http://bitbucket.org/pypy/pypy/changeset/7edaa3448803/
Log: split unicode_encode_utf_8 in the same way as str_decode_utf_8
diff --git a/pypy/rlib/runicode.py b/pypy/rlib/runicode.py
--- a/pypy/rlib/runicode.py
+++ b/pypy/rlib/runicode.py
@@ -256,6 +256,9 @@
def unicode_encode_utf_8(s, size, errors, errorhandler=None):
if errorhandler is None:
errorhandler = raise_unicode_exception_encode
+ return unicode_encode_utf_8_impl(s, size, errors, errorhandler)
+
+def unicode_encode_utf_8_impl(s, size, errors, errorhandler):
assert(size >= 0)
result = StringBuilder(size)
pos = 0
diff --git a/pypy/rpython/rstr.py b/pypy/rpython/rstr.py
--- a/pypy/rpython/rstr.py
+++ b/pypy/rpython/rstr.py
@@ -50,9 +50,10 @@
self.runicode_encode_utf_8 = None
def ensure_ll_encode_utf8(self):
- from pypy.rlib.runicode import unicode_encode_utf_8
- self.runicode_encode_utf_8 = func_with_new_name(unicode_encode_utf_8,
-
'runicode_encode_utf_8')
+ from pypy.rlib.runicode import unicode_encode_utf_8_impl
+ self.runicode_encode_utf_8 = func_with_new_name(
+ unicode_encode_utf_8_impl,
+ 'runicode_encode_utf_8_impl')
def rtype_method_upper(self, hop):
raise TypeError("Cannot do toupper on unicode string")
@@ -65,9 +66,15 @@
from pypy.rpython.annlowlevel import hlunicode
s = hlunicode(ll_s)
assert s is not None
- bytes = self.runicode_encode_utf_8(s, len(s), 'strict')
+ bytes = self.runicode_encode_utf_8(s, len(s), 'strict',
+
self.ll_raise_unicode_exception_encode)
return self.ll.llstr(bytes)
+ def ll_raise_unicode_exception_encode(self, errors, encoding, msg, u,
+ startingpos, endingpos):
+ raise UnicodeEncodeError(encoding, u, startingpos, endingpos, msg)
+
+
class __extend__(annmodel.SomeString):
def rtyper_makerepr(self, rtyper):
return rtyper.type_system.rstr.string_repr
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
