From: Victor Stinner <victor.stinner@haypocalc.com>
Date: Mon, 21 Mar 2011 01:51:38 +0000 (+0100)
Subject: merge 3.1
X-Git-Tag: v3.2.1b1~242
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=56f9a0221b097590436add843b6c96cf8b657af4;p=python

merge 3.1
---

56f9a0221b097590436add843b6c96cf8b657af4
diff --cc Misc/NEWS
index 49626f1af4,90e1ab1a92..5dc8a64918
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -49,10 -40,9 +49,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 #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.
 +
  - Issue #11459: A ``bufsize`` value of 0 in subprocess.Popen() really creates
    unbuffered pipes, such that select() works properly on them.