From: Éric Araujo <merwok@netwok.org>
Date: Mon, 21 Mar 2011 02:17:12 +0000 (+0100)
Subject: Branch merge
X-Git-Tag: v3.3.0a1~2821
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=50dc1a23d8d2e24fe4f344416a8604c4a7c2f60b;p=python

Branch merge
---

50dc1a23d8d2e24fe4f344416a8604c4a7c2f60b
diff --cc Misc/NEWS
index 09293ca842,87477c9d6d..ba1d4244c5
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -81,13 -75,11 +81,16 @@@ Core and Builtin
  Library
  -------
  
+ - Issue #11371: Mark getopt error messages as localizable.  Patch by Filip
+   Gruszczyński.
+ 
 +- Issue #5537: Fix time2isoz() and time2netscape() functions of
 +  httplib.cookiejar for expiration year greater than 2038 on 32-bit systems.
 +
  - Issue #4391: Use proper gettext plural forms in optparse.
  
 +- Issue #11127: Raise a TypeError when trying to pickle a socket object.
 +
  - Issue #11563: Connection:close header is sent by requests using URLOpener
    class which helps in closing of sockets after connection is over. Patch
    contributions by Jeff McNeil and Nadeem Vawda.