changeset: 79345:e7a55a393a80
branch: 3.3
parent: 79341:cb1402f70599
parent: 79344:cb988d601803
user: Ezio Melotti <ezio.melotti@gmail.com>
date: Sun Sep 30 22:47:47 2012 +0300
files: Misc/NEWS Parser/asdl_c.py
description:
#15923: merge with 3.2.
diff -r cb1402f70599 -r e7a55a393a80 Misc/NEWS
--- a/Misc/NEWS	Sun Sep 30 21:26:33 2012 +0200
+++ b/Misc/NEWS	Sun Sep 30 22:47:47 2012 +0300
@@ -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 -r cb1402f70599 -r e7a55a393a80 Parser/asdl_c.py
--- a/Parser/asdl_c.py	Sun Sep 30 21:26:33 2012 +0200
+++ b/Parser/asdl_c.py	Sun Sep 30 22:47:47 2012 +0300
@@ -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)
</div><div class="naked_ctrl">
<form action="/index.cgi/contrast" method="get" name="gate">
<p><a href="http://altstyle.alfasado.net">AltStyle</a> によって変換されたページ <a href="https://hg.python.org/cpython/rev/e7a55a393a80">(-&gt;オリジナル)</a>
/ <label>アドレス: <input type="text" name="naked_post_url" value="https://hg.python.org/cpython/rev/e7a55a393a80" size="22" /></label> <label>モード: <select name="naked_post_mode">
<option value="default">デフォルト</option>
<option value="speech">音声ブラウザ</option>
<option value="ruby">ルビ付き</option>
<option value="contrast" selected="selected">配色反転</option>
<option value="larger-text">文字拡大</option>
<option value="mobile">モバイル</option>
</select>
<input type="submit" value="表示" />
</p>
</form>
</div>