From: Victor Stinner <victor.stinner@haypocalc.com>
Date: Mon, 21 Mar 2011 01:53:04 +0000 (+0100)
Subject: merge 3.2
X-Git-Tag: v3.3.0a1~2822
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f1a9d82e35e5800095c7df8931d712d8644860dc;p=thirdparty%2FPython%2Fcpython.git

merge 3.2
---

f1a9d82e35e5800095c7df8931d712d8644860dc
diff --cc Misc/NEWS
index b2e7a56bf77e,5dc8a6491816..09293ca84215
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -81,10 -49,9 +81,13 @@@ Core and Builtin
  Library
  -------
  
+ - 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.