Author: Matti Picus <[email protected]>
Branch: unicode-utf8-py3
Changeset: r94956:74555d57f729
Date: 2018-08-05 15:14 -0700
http://bitbucket.org/pypy/pypy/changeset/74555d57f729/
Log: more internal utf8/unicode confusion
diff --git a/pypy/interpreter/function.py b/pypy/interpreter/function.py
--- a/pypy/interpreter/function.py
+++ b/pypy/interpreter/function.py
@@ -256,7 +256,7 @@
return self.call_args(__args__)
def descr_function_repr(self):
- return self.getrepr(self.space, u'function %s' %
self.qualname.decode('utf8'))
+ return self.getrepr(self.space, 'function %s' % self.qualname)
def _cleanup_(self):
diff --git a/pypy/module/cpyext/unicodeobject.py
b/pypy/module/cpyext/unicodeobject.py
--- a/pypy/module/cpyext/unicodeobject.py
+++ b/pypy/module/cpyext/unicodeobject.py
@@ -271,7 +271,7 @@
assert isinstance(w_obj, unicodeobject.W_UnicodeObject)
py_obj = as_pyobj(space, w_obj)
assert get_kind(py_obj) == WCHAR_KIND
- return _readify(space, py_obj, space.utf8_w(w_obj))
+ return _readify(space, py_obj, space.utf8_w(w_obj).decode('utf8'))
def _readify(space, py_obj, value):
maxchar = 0
diff --git a/pypy/module/thread/os_lock.py b/pypy/module/thread/os_lock.py
--- a/pypy/module/thread/os_lock.py
+++ b/pypy/module/thread/os_lock.py
@@ -121,10 +121,10 @@
def descr__repr__(self, space):
classname = space.getfulltypename(self)
if self._is_locked():
- locked = u"locked"
+ locked = "locked"
else:
- locked = u"unlocked"
- return self.getrepr(space, u'%s %s object' % (locked, classname))
+ locked = "unlocked"
+ return self.getrepr(space, '%s %s object' % (locked, classname))
Lock.typedef = TypeDef(
"_thread.lock",
@@ -189,10 +189,10 @@
def descr__repr__(self, space):
classname = space.getfulltypename(self)
if self.rlock_count == 0:
- locked = u"unlocked"
+ locked = "unlocked"
else:
- locked = u"locked"
- return self.getrepr(space, u'%s %s object owner=%d count=%d' % (
+ locked = "locked"
+ return self.getrepr(space, '%s %s object owner=%d count=%d' % (
locked, classname, self.rlock_owner, self.rlock_count))
@unwrap_spec(blocking=int, timeout=float)
diff --git a/pypy/objspace/std/memoryobject.py
b/pypy/objspace/std/memoryobject.py
--- a/pypy/objspace/std/memoryobject.py
+++ b/pypy/objspace/std/memoryobject.py
@@ -267,9 +267,9 @@
def descr_repr(self, space):
if self.view is None:
- return self.getrepr(space, u'released memory')
+ return self.getrepr(space, 'released memory')
else:
- return self.getrepr(space, u'memory')
+ return self.getrepr(space, 'memory')
def descr_hash(self, space):
if self._hash == -1:
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
