Issue #13436: Fix a bogus error message when an AST object was passed

amauryfa · amauryfa · commit 58e8761da6d1 · 2011-11-22T21:51:55.000+01:00
an invalid integer value.
diff --git a/Lib/test/test_ast.py b/Lib/test/test_ast.py
@@ -486,6 +486,17 @@ def test_literal_eval_issue4907(self):
         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
@@ -10,6 +10,9 @@ What's New in Python 3.2.3?
 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
@@ -816,11 +816,7 @@ def visitModule(self, mod):
 {
     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;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -816,11 +816,7 @@ def visitModule(self, mod):`
`816`	`816`	`{`
`817`	`817`	`int i;`
`818`	`818`	`if (!PyLong_Check(obj)) {`
`819`		`- PyObject *s = PyObject_Repr(obj);`
`820`		`- if (s == NULL) return 1;`
`821`		`- PyErr_Format(PyExc_ValueError, "invalid integer value: %.400s",`
`822`		`- PyBytes_AS_STRING(s));`
`823`		`- Py_DECREF(s);`
	`819`	`+ PyErr_Format(PyExc_ValueError, "invalid integer value: %R", obj);`
`824`	`820`	`return 1;`
`825`	`821`	`}`
`826`	`822`