Author: Philip Jenvey <pjen...@underboss.org>
Branch:
Changeset: r64668:1cb8c9339d1a
Date: 2013-05-30 12:31 -0700
http://bitbucket.org/pypy/pypy/changeset/1cb8c9339d1a/
Log: simplify
diff --git a/pypy/objspace/std/stdtypedef.py b/pypy/objspace/std/stdtypedef.py
--- a/pypy/objspace/std/stdtypedef.py
+++ b/pypy/objspace/std/stdtypedef.py
@@ -147,21 +147,12 @@
else:
plural = ''
return "unsupported operand type%s for %%s: %s" % (
- plural, ', '.join(["'%s'"] * nbargs))
+ plural, ', '.join(["'%T'"] * nbargs))
_gettypeerrormsg._annspecialcase_ = 'specialize:memo'
-def _gettypenames(space, *args_w):
- if args_w:
- typename = space.type(args_w[-1]).getname(space)
- return _gettypenames(space, *args_w[:-1]) + (typename,)
- return ()
-_gettypenames._always_inline_ = True
-
def gettypeerror(space, operatorsymbol, *args_w):
msg = _gettypeerrormsg(len(args_w))
- type_names = _gettypenames(space, *args_w)
- return operationerrfmt(space.w_TypeError, msg,
- operatorsymbol, *type_names)
+ return operationerrfmt(space.w_TypeError, msg, operatorsymbol, *args_w)
def make_perform_trampoline(prefix, exprargs, expr, miniglobals, multimethod,
selfindex=0,
allow_NotImplemented_results=False):
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
