From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Sun, 18 Nov 2012 12:02:08 +0000 (+0200)
Subject: #16306: merge with 3.2.
X-Git-Tag: v3.3.1rc1~619
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f7c709d62d09ef91b335ac7c262f0079713846a1;p=python

#16306: merge with 3.2.
---

f7c709d62d09ef91b335ac7c262f0079713846a1
diff --cc Misc/ACKS
index abf4a5ddc6,1f51fbd551..ced316890b
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@@ -835,9 -757,9 +835,10 @@@ Trent Nelso
  Chad Netzer
  Max Neunhöffer
  George Neville-Neil
+ Hieu Nguyen
  Johannes Nicolai
  Samuel Nicolary
 +Jonathan Niehof
  Gustavo Niemeyer
  Oscar Nierstrasz
  Hrvoje Niksic
diff --cc Misc/NEWS
index 0cf165eb30,c8580e33cb..9771ecd5a3
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -12,9 -10,9 +12,12 @@@ What's New in Python 3.3.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.
 +
  - Issue #16453: Fix equality testing of dead weakref objects.
  
  - Issue #9535: Fix pending signals that have been received but not yet