[Python-checkins] cpython (merge 3.2 -> 3.3): #15923: merge with 3.2.
ezio.melotti
python-checkins at python.org
Sun Sep 30 21:49:09 CEST 2012
http://hg.python.org/cpython/rev/e7a55a393a80
changeset: 79345:e7a55a393a80
branch: 3.3
parent: 79341:cb1402f70599
parent: 79344:cb988d601803
user: Ezio Melotti <ezio.melotti at gmail.com>
date: Sun Sep 30 22:47:47 2012 +0300
summary:
#15923: merge with 3.2.
files:
Misc/NEWS | 3 +++
Parser/asdl_c.py | 2 +-
2 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -99,6 +99,9 @@
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
--- a/Parser/asdl_c.py
+++ b/Parser/asdl_c.py
@@ -1064,7 +1064,7 @@
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)
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list