summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2012-11-18 12:06:54 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2012-11-18 12:06:54 (GMT)
commit195ad6ce052bfdda8f47ffbf14becb95253bafc6 (patch)
treec0f490b174554b01c026004656614852064a11ba /Misc
parent6654de69b2ac20651c708eb3183b61c03624a018 (diff)
parentf7c709d62d09ef91b335ac7c262f0079713846a1 (diff)
downloadcpython-195ad6ce052bfdda8f47ffbf14becb95253bafc6.zip
cpython-195ad6ce052bfdda8f47ffbf14becb95253bafc6.tar.gz
cpython-195ad6ce052bfdda8f47ffbf14becb95253bafc6.tar.bz2
#16306: merge with 3.3.
Diffstat (limited to 'Misc')
-rw-r--r--Misc/ACKS1
-rw-r--r--Misc/NEWS3
2 files changed, 4 insertions, 0 deletions
diff --git a/Misc/ACKS b/Misc/ACKS
index f469ee2..45ef0c7 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -837,6 +837,7 @@ Trent Nelson
Chad Netzer
Max Neunhöffer
George Neville-Neil
+Hieu Nguyen
Johannes Nicolai
Samuel Nicolary
Jonathan Niehof
diff --git a/Misc/NEWS b/Misc/NEWS
index 778a817..968ba01 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,9 @@ What's New in Python 3.4.0 Alpha 1?
Core and Builtins
-----------------
+- Issue #16306: Fix multiple error messages when unknown command line
+ parameters where passed to the interpreter. Patch by Hieu Nguyen.
+
- Issue #16215: Fix potential double memory free in str.replace(). Patch
by Serhiy Storchaka.