]> granicus.if.org Git - python/commitdiff
Merge 3.2
authorBrian Curtin <brian@python.org>
Fri, 11 Nov 2011 15:41:17 +0000 (09:41 -0600)
committerBrian Curtin <brian@python.org>
Fri, 11 Nov 2011 15:41:17 +0000 (09:41 -0600)
1  2 
Lib/random.py
Misc/NEWS

diff --cc Lib/random.py
Simple merge
diff --cc Misc/NEWS
index 2841fb7ffe8a8b4f9c66cecfe67ce30347f5142e,b1710d88bf7d10cf813a946715e52eb9a9c7a491..56802b533c8096a58a8ccaacd30d0c43e8596f37
+++ 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.