Author: Philip Jenvey <pjen...@underboss.org>
Branch: py3k
Changeset: r84114:796445937161
Date: 2016-05-01 21:43 -0700
http://bitbucket.org/pypy/pypy/changeset/796445937161/
Log: merge default
diff --git a/pypy/module/cppyy/interp_cppyy.py
b/pypy/module/cppyy/interp_cppyy.py
--- a/pypy/module/cppyy/interp_cppyy.py
+++ b/pypy/module/cppyy/interp_cppyy.py
@@ -436,7 +436,7 @@
s = capi.c_resolve_name(self.space, s)
if s != self.templ_args[i]:
raise OperationError(self.space.w_TypeError, self.space.wrap(
- "non-matching template (got %s where %s expected" % (s,
self.templ_args[i])))
+ "non-matching template (got %s where %s expected)" % (s,
self.templ_args[i])))
return W_CPPBoundMethod(cppthis, self)
def bound_call(self, cppthis, args_w):
diff --git a/pypy/objspace/std/newformat.py b/pypy/objspace/std/newformat.py
--- a/pypy/objspace/std/newformat.py
+++ b/pypy/objspace/std/newformat.py
@@ -568,7 +568,7 @@
msg = "Sign not allowed in string format specifier"
raise OperationError(space.w_ValueError, space.wrap(msg))
if self._alternate:
- msg = "Alternate form not allowed in string format specifier"
+ msg = "Alternate form (#) not allowed in string format
specifier"
raise OperationError(space.w_ValueError, space.wrap(msg))
if self._align == "=":
msg = "'=' alignment not allowed in string format specifier"
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
