Author: Brian Kearns <[email protected]>
Branch:
Changeset: r62363:9ea8ae583d55
Date: 2013-03-15 16:59 -0400
http://bitbucket.org/pypy/pypy/changeset/9ea8ae583d55/
Log: call encode/decode instead of using utf_8_encode/decode
diff --git a/lib_pypy/_marshal.py b/lib_pypy/_marshal.py
--- a/lib_pypy/_marshal.py
+++ b/lib_pypy/_marshal.py
@@ -7,7 +7,6 @@
# the "sandboxed" process. It must work for Python2 as well.
import types
-from _codecs import utf_8_decode, utf_8_encode
try:
intern
@@ -166,8 +165,7 @@
def dump_unicode(self, x):
self._write(TYPE_UNICODE)
- #s = x.encode('utf8')
- s = utf_8_encode(x)[0]
+ s = x.encode('utf8')
self.w_long(len(s))
self._write(s)
try:
@@ -386,8 +384,7 @@
def load_unicode(self):
n = self.r_long()
s = self._read(n)
- #ret = s.decode('utf8')
- ret = utf_8_decode(s)[0]
+ ret = s.decode('utf8')
return ret
dispatch[TYPE_UNICODE] = load_unicode
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
