Author: Manuel Jacob
Branch: remove-remaining-smm
Changeset: r69332:86996b85032a
Date: 2014-02-24 03:46 +0100
http://bitbucket.org/pypy/pypy/changeset/86996b85032a/
Log: Organize imports.
diff --git a/pypy/objspace/std/floatobject.py b/pypy/objspace/std/floatobject.py
--- a/pypy/objspace/std/floatobject.py
+++ b/pypy/objspace/std/floatobject.py
@@ -12,10 +12,10 @@
from pypy.objspace.std.stdtypedef import StdTypeDef
from rpython.rlib import rarithmetic, rfloat
from rpython.rlib.rarithmetic import ovfcheck_float_to_int, intmask, LONG_BIT
+from rpython.rlib.rbigint import rbigint
from rpython.rlib.rfloat import (
isinf, isnan, isfinite, INFINITY, NAN, copysign, formatd,
DTSF_ADD_DOT_0, DTSF_STR_PRECISION, float_as_rbigint_ratio)
-from rpython.rlib.rbigint import rbigint
from rpython.rlib.rstring import ParseStringError
from rpython.rlib.unroll import unrolling_iterable
diff --git a/pypy/objspace/std/test/test_floatobject.py
b/pypy/objspace/std/test/test_floatobject.py
--- a/pypy/objspace/std/test/test_floatobject.py
+++ b/pypy/objspace/std/test/test_floatobject.py
@@ -1,16 +1,16 @@
-from pypy.objspace.std import floatobject as fobj
-from pypy.objspace.std.multimethod import FailedToImplement
-import py, sys
+import sys
+
+from pypy.objspace.std.floatobject import W_FloatObject
+
class TestW_FloatObject:
-
def test_pow_fff(self):
x = 10.0
y = 2.0
z = 13.0
- f1 = fobj.W_FloatObject(x)
- f2 = fobj.W_FloatObject(y)
- f3 = fobj.W_FloatObject(z)
+ f1 = W_FloatObject(x)
+ f2 = W_FloatObject(y)
+ f3 = W_FloatObject(z)
self.space.raises_w(self.space.w_TypeError,
f1.descr_pow,
self.space, f2, f3)
@@ -18,20 +18,20 @@
def test_pow_ffn(self):
x = 10.0
y = 2.0
- f1 = fobj.W_FloatObject(x)
- f2 = fobj.W_FloatObject(y)
+ f1 = W_FloatObject(x)
+ f2 = W_FloatObject(y)
v = f1.descr_pow(self.space, f2, self.space.w_None)
assert v.floatval == x ** y
- f1 = fobj.W_FloatObject(-1.23)
- f2 = fobj.W_FloatObject(-4.56)
+ f1 = W_FloatObject(-1.23)
+ f2 = W_FloatObject(-4.56)
self.space.raises_w(self.space.w_ValueError,
f1.descr_pow,
self.space, f2,
self.space.w_None)
x = -10
y = 2.0
- f1 = fobj.W_FloatObject(x)
- f2 = fobj.W_FloatObject(y)
+ f1 = W_FloatObject(x)
+ f2 = W_FloatObject(y)
v = f1.descr_pow(self.space, f2, self.space.w_None)
assert v.floatval == x**y
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
