[Python-checkins] cpython (merge 3.4 -> default): merge 3.4

[benjamin.peterson]

https://hg.python.org/cpython/rev/5a87fb8df5fe
changeset:   94919:5a87fb8df5fe
parent:      94917:41839a8a526b
parent:      94918:54d9c3be8f50
user:        Benjamin Peterson <benjamin at python.org>
date:        Mon Mar 09 10:37:59 2015 -0400
summary:
  merge 3.4

files:
  Lib/test/test_float.py |  13 ++++++++-----
  1 files changed, 8 insertions(+), 5 deletions(-)


diff --git a/Lib/test/test_float.py b/Lib/test/test_float.py
--- a/Lib/test/test_float.py
+++ b/Lib/test/test_float.py
@@ -1,13 +1,16 @@
 
-import unittest, struct
+import fractions
+import math
+import operator
 import os
+import random
 import sys
+import struct
+import time
+import unittest
+
 from test import support
-import math
 from math import isinf, isnan, copysign, ldexp
-import operator
-import time
-import random, fractions
 
 INF = float("inf")
 NAN = float("nan")

-- 
Repository URL: https://hg.python.org/cpython