Author: Matti Picus <[email protected]>
Branch: unicode-utf8-py3
Changeset: r94960:31049cf23000
Date: 2018-08-05 19:20 -0700
http://bitbucket.org/pypy/pypy/changeset/31049cf23000/
Log: unicode -> utf8, non-negative len
diff --git a/pypy/interpreter/generator.py b/pypy/interpreter/generator.py
--- a/pypy/interpreter/generator.py
+++ b/pypy/interpreter/generator.py
@@ -38,7 +38,7 @@
# 'qualname' is a unicode string
if self._qualname is not None:
return self._qualname
- return self.get_name().decode('utf-8')
+ return self.get_name()
def descr__repr__(self, space):
addrstring = self.getaddrstring(space)
diff --git a/pypy/interpreter/pycode.py b/pypy/interpreter/pycode.py
--- a/pypy/interpreter/pycode.py
+++ b/pypy/interpreter/pycode.py
@@ -452,8 +452,8 @@
def repr(self, space):
space = self.space
# co_name should be an identifier
- name = self.co_name.decode('utf-8')
+ name = self.co_name
fn = space.utf8_w(self.w_filename)
return space.newtext(b'<code object %s at 0x%s, file "%s", line %d>' %
(
- name, unicode(self.getaddrstring(space)), fn,
+ name, self.getaddrstring(space), fn,
-1 if self.co_firstlineno == 0 else self.co_firstlineno))
diff --git a/pypy/interpreter/pyparser/pytokenizer.py
b/pypy/interpreter/pyparser/pytokenizer.py
--- a/pypy/interpreter/pyparser/pytokenizer.py
+++ b/pypy/interpreter/pyparser/pytokenizer.py
@@ -79,7 +79,7 @@
except UnicodeDecodeError:
return -1
from pypy.objspace.std.unicodeobject import _isidentifier
- return _isidentifier(u)
+ return _isidentifier(token)
DUMMY_DFA = automata.DFA([], [])
diff --git a/pypy/module/_cffi_backend/ctypeprim.py
b/pypy/module/_cffi_backend/ctypeprim.py
--- a/pypy/module/_cffi_backend/ctypeprim.py
+++ b/pypy/module/_cffi_backend/ctypeprim.py
@@ -222,6 +222,7 @@
raise oefmt(self.space.w_ValueError,
"%s out of range for conversion to unicode: %s",
self.name, hex(e.ordinal))
+ assert lgt >= 0
return self.space.newutf8(utf8, lgt)
diff --git a/pypy/module/_multibytecodec/interp_multibytecodec.py
b/pypy/module/_multibytecodec/interp_multibytecodec.py
--- a/pypy/module/_multibytecodec/interp_multibytecodec.py
+++ b/pypy/module/_multibytecodec/interp_multibytecodec.py
@@ -78,6 +78,7 @@
space.newtext(e.reason)]))
def wrap_unicodeencodeerror(space, e, input, inputlen, name):
+ assert inputlen >= 0
raise OperationError(
space.w_UnicodeEncodeError,
space.newtuple([
diff --git a/pypy/module/cpyext/api.py b/pypy/module/cpyext/api.py
--- a/pypy/module/cpyext/api.py
+++ b/pypy/module/cpyext/api.py
@@ -1711,7 +1711,7 @@
look_for = also_look_for
assert look_for is not None
msg = b"function %s not found in library %s" % (
- look_for.decode('utf-8'), space.utf8_w(space.newfilename(path)))
+ look_for, space.utf8_w(space.newfilename(path)))
w_path = space.newfilename(path)
raise_import_error(space, space.newtext(msg), w_name, w_path)
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
