Author: Ronan Lamy <[email protected]>
Branch: py3k
Changeset: r86177:3a81057901f3
Date: 2016-08-12 18:48 +0100
http://bitbucket.org/pypy/pypy/changeset/3a81057901f3/
Log: Fix bad change in b053ff5c2d6d
diff --git a/pypy/objspace/std/typeobject.py b/pypy/objspace/std/typeobject.py
--- a/pypy/objspace/std/typeobject.py
+++ b/pypy/objspace/std/typeobject.py
@@ -1288,8 +1288,9 @@
cycle.append(candidate)
cycle.reverse()
names = [cls.getname(space) for cls in cycle]
- raise oefmt(space.w_TypeError,
- "cycle among base classes: %s", ' < '.join(names))
+ # Can't use oefmt() here, since names is a list of unicodes
+ raise OperationError(space.w_TypeError, space.newunicode(
+ u"cycle among base classes: " + u' < '.join(names)))
class TypeCache(SpaceCache):
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit