summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Svetlov <andrew.svetlov@gmail.com>2012-07-22 10:56:54 (GMT)
committerAndrew Svetlov <andrew.svetlov@gmail.com>2012-07-22 10:56:54 (GMT)
commit80823d7ed75fef43b47a1f9312224bd93b1628ae (patch)
treeb0441243744b7cae392f3191895c4783bc27ba96
parentc7a5a76b1ebaeb07617f17fd1952c871e7c9e3b4 (diff)
downloadcpython-80823d7ed75fef43b47a1f9312224bd93b1628ae.zip
cpython-80823d7ed75fef43b47a1f9312224bd93b1628ae.tar.gz
cpython-80823d7ed75fef43b47a1f9312224bd93b1628ae.tar.bz2
#15094: fix incorrectly placed #endif in _tkinter.c.
Patch by Serhiy Storchaka.
-rw-r--r--Misc/NEWS3
-rw-r--r--Modules/_tkinter.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index a960f2f..62099bf 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -52,6 +52,9 @@ Core and Builtins
Library
-------
+- Issue #15094: Incorrectly placed #endif in _tkinter.c.
+ Patch by Serhiy Storchaka.
+
- Issue #13922: argparse no longer incorrectly strips '--'s that appear
after the first one.
diff --git a/Modules/_tkinter.c b/Modules/_tkinter.c
index f6cd88d..70f4703 100644
--- a/Modules/_tkinter.c
+++ b/Modules/_tkinter.c
@@ -996,8 +996,8 @@ AsObj(PyObject *value)
ch);
ckfree(FREECAST outbuf);
return NULL;
-#endif
}
+#endif
outbuf[i] = ch;
}
result = Tcl_NewUnicodeObj(outbuf, size);