[pypy-commit] pypy default: utilize %T for py3k (don't need the full get_module_type_name anyway)
pjenvey
noreply at buildbot.pypy.org
Wed Apr 30 00:19:40 CEST 2014
Author: Philip Jenvey <pjenvey at underboss.org>
Branch:
Changeset: r71067:c4296bb01a13
Date: 2014-04-29 15:13 -0700
http://bitbucket.org/pypy/pypy/changeset/c4296bb01a13/
Log: utilize %T for py3k (don't need the full get_module_type_name
anyway)
diff --git a/pypy/interpreter/baseobjspace.py b/pypy/interpreter/baseobjspace.py
--- a/pypy/interpreter/baseobjspace.py
+++ b/pypy/interpreter/baseobjspace.py
@@ -1415,10 +1415,10 @@
def _getarg_error(self, expected, w_obj):
if self.is_none(w_obj):
- name = "None"
+ e = oefmt(self.w_TypeError, "must be %s, not None", expected)
else:
- name = self.type(w_obj).get_module_type_name()
- raise oefmt(self.w_TypeError, "must be %s, not %s", expected, name)
+ e = oefmt(self.w_TypeError, "must be %s, not %T", expected, w_obj)
+ raise e
@specialize.arg(1)
def getarg_w(self, code, w_obj):
More information about the pypy-commit
mailing list