summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2012-09-30 19:47:47 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2012-09-30 19:47:47 (GMT)
commit8a9cc526fe1d4be23b733a81383fff80a04172f2 (patch)
treeb35544806aeac10be124f125d71c8756f9cadb52
parentffc3dee5aee9f5eec6fbc8e7b48e6fe95bb0e029 (diff)
parentcb2916a7144679cdc9a5df430dfc1344e02243fb (diff)
downloadcpython-8a9cc526fe1d4be23b733a81383fff80a04172f2.zip
cpython-8a9cc526fe1d4be23b733a81383fff80a04172f2.tar.gz
cpython-8a9cc526fe1d4be23b733a81383fff80a04172f2.tar.bz2
#15923: merge with 3.2.
-rw-r--r--Misc/NEWS3
-rwxr-xr-xParser/asdl_c.py2
2 files changed, 4 insertions, 1 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index 794363e..f3e0db9 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -99,6 +99,9 @@ Tests
Build
-----
+- Issue #15923: fix a mistake in asdl_c.py that resulted in a TypeError after
+ 2801bf875a24 (see #15801).
+
- Issue #15819: Make sure we can build Python out-of-tree from a readonly
source directory. (Somewhat related to Issue #9860.)
diff --git a/Parser/asdl_c.py b/Parser/asdl_c.py
index 698afac..5748360 100755
--- a/Parser/asdl_c.py
+++ b/Parser/asdl_c.py
@@ -1064,7 +1064,7 @@ class ObjVisitor(PickleVisitor):
self.emit("case %s:" % t.name, 2)
self.emit("Py_INCREF(%s_singleton);" % t.name, 3)
self.emit("return %s_singleton;" % t.name, 3)
- self.emit("default:" % name, 2)
+ self.emit("default:", 2)
self.emit('/* should never happen, but just in case ... */', 3)
code = "PyErr_Format(PyExc_SystemError, \"unknown %s found\");" % name
self.emit(code, 3, reflow=False)