Merge 3.2

2011-11-11 09:41:17 -06:00 · 2011-11-11 09:41:17 -06:00 · 4ff29db243
parent 40dc919b0d 675f6b87cd
commit 4ff29db243
2 changed files with 2 additions and 1 deletions
--- a/Lib/random.py
+++ b/Lib/random.py
@ -36,7 +36,6 @@ General notes on the underlying Mersenne Twister core generator:

 """

-from __future__ import division
 from warnings import warn as _warn
 from types import MethodType as _MethodType, BuiltinMethodType as _BuiltinMethodType
 from math import log as _log, exp as _exp, pi as _pi, e as _e, ceil as _ceil
--- a/Misc/NEWS
+++ b/Misc/NEWS
@ -365,6 +365,8 @@ Core and Builtins
 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