[pypy-commit] pypy py3.6: test, fix cpython3 exception compatibility

[mattip]

Author: Matti Picus <matti.picus at gmail.com>
Branch: py3.6
Changeset: r97306:50fa3485909f
Date: 2019-08-27 15:22 +0300
http://bitbucket.org/pypy/pypy/changeset/50fa3485909f/

Log:	test, fix cpython3 exception compatibility

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
@@ -545,7 +545,8 @@
                     pass # ok
                 else:
                     raise oefmt(space.w_ValueError,
-                                "invalid type with ',' or '_'")
+                                "Cannot specify '%s' with '%s'.", 
+                                self._thousands_sep, tp)
             return False
 
         def _calc_padding(self, string, length):
diff --git a/pypy/objspace/std/test/test_newformat.py b/pypy/objspace/std/test/test_newformat.py
--- a/pypy/objspace/std/test/test_newformat.py
+++ b/pypy/objspace/std/test/test_newformat.py
@@ -260,7 +260,8 @@
         a = self.i(ord("a"))
         assert format(a, "c") == "a"
         raises(ValueError, format, a, "-c")
-        raises(ValueError, format, a, ",c")
+        exc = raises(ValueError, format, a, ",c")
+        assert str(exc.value) == "Cannot specify ',' with 'c'.", str(exc.value)
         raises(ValueError, format, a, "_c")
         raises(ValueError, format, a, "#c")
         assert format(a, "3c") == "  a"