Merge branch 3.2
diff --git a/Doc/library/exceptions.rst b/Doc/library/exceptions.rst
index 528febd..ca3ad3e 100644
--- a/Doc/library/exceptions.rst
+++ b/Doc/library/exceptions.rst
@@ -40,9 +40,9 @@
The base class for all built-in exceptions. It is not meant to be directly
inherited by user-defined classes (for that, use :exc:`Exception`). If
- :func:`bytes` or :func:`str` is called on an instance of this class, the
- representation of the argument(s) to the instance are returned, or the empty
- string when there were no arguments.
+ :func:`str` is called on an instance of this class, the representation of
+ the argument(s) to the instance are returned, or the empty string when
+ there were no arguments.
.. attribute:: args
diff --git a/Lib/test/test_ast.py b/Lib/test/test_ast.py
index 2ba3ea5..be9f05e 100644
--- a/Lib/test/test_ast.py
+++ b/Lib/test/test_ast.py
@@ -486,6 +486,17 @@
self.assertEqual(ast.literal_eval('10 + 2j'), 10 + 2j)
self.assertEqual(ast.literal_eval('1.5 - 2j'), 1.5 - 2j)
+ def test_bad_integer(self):
+ # issue13436: Bad error message with invalid numeric values
+ body = [ast.ImportFrom(module='time',
+ names=[ast.alias(name='sleep')],
+ level=None,
+ lineno=None, col_offset=None)]
+ mod = ast.Module(body)
+ with self.assertRaises(ValueError) as cm:
+ compile(mod, 'test', 'exec')
+ self.assertIn("invalid integer value: None", str(cm.exception))
+
def test_main():
support.run_unittest(AST_Tests, ASTHelpers_Test)
diff --git a/Misc/NEWS b/Misc/NEWS
index 7992e8b..6350818 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,9 @@
Core and Builtins
-----------------
+- Issue #13436: Fix a bogus error message when an AST object was passed
+ an invalid integer value.
+
- Issue #13338: Handle all enumerations in _Py_ANNOTATE_MEMORY_ORDER
to allow compiling extension modules with -Wswitch-enum on gcc.
Initial patch by Floris Bruynooghe.
diff --git a/Parser/asdl_c.py b/Parser/asdl_c.py
index 249e18d..b85c07e 100755
--- a/Parser/asdl_c.py
+++ b/Parser/asdl_c.py
@@ -816,11 +816,7 @@
{
int i;
if (!PyLong_Check(obj)) {
- PyObject *s = PyObject_Repr(obj);
- if (s == NULL) return 1;
- PyErr_Format(PyExc_ValueError, "invalid integer value: %.400s",
- PyBytes_AS_STRING(s));
- Py_DECREF(s);
+ PyErr_Format(PyExc_ValueError, "invalid integer value: %R", obj);
return 1;
}
diff --git a/Python/Python-ast.c b/Python/Python-ast.c
index 89c07cd..a276b6c 100644
--- a/Python/Python-ast.c
+++ b/Python/Python-ast.c
@@ -622,11 +622,7 @@
{
int i;
if (!PyLong_Check(obj)) {
- PyObject *s = PyObject_Repr(obj);
- if (s == NULL) return 1;
- PyErr_Format(PyExc_ValueError, "invalid integer value: %.400s",
- PyBytes_AS_STRING(s));
- Py_DECREF(s);
+ PyErr_Format(PyExc_ValueError, "invalid integer value: %R", obj);
return 1;
}