From: Brian Curtin <brian@python.org>
Date: Fri, 11 Nov 2011 15:41:17 +0000 (-0600)
Subject: Merge 3.2
X-Git-Tag: v3.3.0a1~866
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4ff29db243e0c64356477f0d0b7270b35365757e;p=thirdparty%2FPython%2Fcpython.git

Merge 3.2
---

4ff29db243e0c64356477f0d0b7270b35365757e
diff --cc Misc/NEWS
index 2841fb7ffe8a,b1710d88bf7d..56802b533c80
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -365,8 -73,8 +365,10 @@@ Core and Builtin
  Library
  -------
  
+ - Issue #13384: Remove unnecessary __future__ import in Lib/random.py
+ 
 +- Issue #13149: Speed up append-only StringIO objects.
 +
  - Issue #13373: multiprocessing.Queue.get() could sometimes block indefinitely
    when called with a timeout.  Patch by Arnaud Ysmal.