Merge pull request sympy#17779 from oscarbenjamin/flake8_core

oscarbenjamin · web-flow · commit 4764908a2de7 · 2019-11-10T21:13:33.000Z
Fix import etc flake8 issues in core
diff --git a/sympy/core/expr.py b/sympy/core/expr.py
@@ -732,7 +732,6 @@ def equals(self, other, failing_expression=False):
 
         """
         from sympy.simplify.simplify import nsimplify, simplify
-        from sympy.solvers.solveset import solveset
         from sympy.solvers.solvers import solve
         from sympy.polys.polyerrors import NotAlgebraic
         from sympy.polys.numberfields import minimal_polynomial
@@ -2999,7 +2998,7 @@ def aseries(self, x=None, n=6, bound=0, hir=False):
 
         from sympy import Order, Dummy
         from sympy.functions import exp, log
-        from sympy.series.gruntz import mrv, rewrite, mrv_leadterm
+        from sympy.series.gruntz import mrv, rewrite
 
         if x.is_positive is x.is_negative is None:
             xpos = Dummy('x', positive=True)
@@ -3626,7 +3625,6 @@ def round(self, n=None):
         >>> isinstance(round(S(123), -2), Number)
         True
         """
-        from sympy.core.power import integer_log
         from sympy.core.numbers import Float
 
         x = self
diff --git a/sympy/core/function.py b/sympy/core/function.py
@@ -32,7 +32,7 @@
 from __future__ import print_function, division
 
 from .add import Add
-from .assumptions import ManagedProperties, _assume_defined
+from .assumptions import ManagedProperties
 from .basic import Basic, _atomic
 from .cache import cacheit
 from .compatibility import iterable, is_sequence, as_int, ordered, Iterable
@@ -1237,7 +1237,7 @@ def __new__(cls, expr, *variables, **kwargs):
 
         from sympy.matrices.common import MatrixCommon
         from sympy import Integer, MatrixExpr
-        from sympy.tensor.array import Array, NDimArray, derive_by_array
+        from sympy.tensor.array import Array, NDimArray
         from sympy.utilities.misc import filldedent
 
         expr = sympify(expr)
diff --git a/sympy/core/power.py b/sympy/core/power.py
@@ -1149,12 +1149,12 @@ def as_real_imag(self, deep=True, **hints):
 
         if self.exp.is_Integer:
             exp = self.exp
-            re, im = self.base.as_real_imag(deep=deep)
-            if not im:
+            re_e, im_e = self.base.as_real_imag(deep=deep)
+            if not im_e:
                 return self, S.Zero
             a, b = symbols('a b', cls=Dummy)
             if exp >= 0:
-                if re.is_Number and im.is_Number:
+                if re_e.is_Number and im_e.is_Number:
                     # We can be more efficient in this case
                     expr = expand_multinomial(self.base**exp)
                     if expr != self:
@@ -1163,11 +1163,11 @@ def as_real_imag(self, deep=True, **hints):
                 expr = poly(
                     (a + b)**exp)  # a = re, b = im; expr = (a + b*I)**exp
             else:
-                mag = re**2 + im**2
-                re, im = re/mag, -im/mag
-                if re.is_Number and im.is_Number:
+                mag = re_e**2 + im_e**2
+                re_e, im_e = re_e/mag, -im_e/mag
+                if re_e.is_Number and im_e.is_Number:
                     # We can be more efficient in this case
-                    expr = expand_multinomial((re + im*S.ImaginaryUnit)**-exp)
+                    expr = expand_multinomial((re_e + im_e*S.ImaginaryUnit)**-exp)
                     if expr != self:
                         return expr.as_real_imag()
 
@@ -1182,23 +1182,23 @@ def as_real_imag(self, deep=True, **hints):
             r = [i for i in expr.terms() if i[0][1] % 4 == 3]
             im_part3 = Add(*[cc*a**aa*b**bb for (aa, bb), cc in r])
 
-            return (re_part.subs({a: re, b: S.ImaginaryUnit*im}),
-            im_part1.subs({a: re, b: im}) + im_part3.subs({a: re, b: -im}))
+            return (re_part.subs({a: re_e, b: S.ImaginaryUnit*im_e}),
+            im_part1.subs({a: re_e, b: im_e}) + im_part3.subs({a: re_e, b: -im_e}))
 
         elif self.exp.is_Rational:
-            re, im = self.base.as_real_imag(deep=deep)
+            re_e, im_e = self.base.as_real_imag(deep=deep)
 
-            if im.is_zero and self.exp is S.Half:
-                if re.is_extended_nonnegative:
+            if im_e.is_zero and self.exp is S.Half:
+                if re_e.is_extended_nonnegative:
                     return self, S.Zero
-                if re.is_extended_nonpositive:
+                if re_e.is_extended_nonpositive:
                     return S.Zero, (-self.base)**self.exp
 
             # XXX: This is not totally correct since for x**(p/q) with
             #      x being imaginary there are actually q roots, but
             #      only a single one is returned from here.
-            r = self.func(self.func(re, 2) + self.func(im, 2), S.Half)
-            t = atan2(im, re)
+            r = self.func(self.func(re_e, 2) + self.func(im_e, 2), S.Half)
+            t = atan2(im_e, re_e)
 
             rp, tp = self.func(r, self.exp), t*self.exp
 
diff --git a/sympy/core/tests/test_args.py b/sympy/core/tests/test_args.py
@@ -936,7 +936,6 @@ def test_sympy__sets__fancysets__ComplexRegion():
 
 def test_sympy__sets__fancysets__CartesianComplexRegion():
     from sympy.sets.fancysets import CartesianComplexRegion
-    from sympy import S
     from sympy.sets import Interval
     a = Interval(0, 1)
     b = Interval(2, 3)
@@ -1572,7 +1571,6 @@ def test_sympy__stats__joint_rv_types__NegativeMultinomialDistribution():
 
 def test_sympy__stats__rv__RandomIndexedSymbol():
     from sympy.stats.rv import RandomIndexedSymbol, pspace
-    from sympy.tensor import Indexed
     from sympy.stats.stochastic_process_types import DiscreteMarkovChain
     X = DiscreteMarkovChain("X")
     assert _test_args(RandomIndexedSymbol(X[0].symbol, pspace(X[0])))
@@ -1619,7 +1617,6 @@ def test_sympy__stats__stochastic_process_types__GeneratorMatrixOf():
 
 def test_sympy__stats__stochastic_process_types__StochasticStateSpaceOf():
     from sympy.stats.stochastic_process_types import StochasticStateSpaceOf, DiscreteMarkovChain
-    from sympy import MatrixSymbol
     DMC = DiscreteMarkovChain("Y")
     assert _test_args(StochasticStateSpaceOf(DMC, [0, 1, 2]))
 
@@ -3862,7 +3859,6 @@ def test_sympy__physics__units__dimensions__DimensionSystem():
 
 def test_sympy__physics__units__quantities__Quantity():
     from sympy.physics.units.quantities import Quantity
-    from sympy.physics.units import length
     assert _test_args(Quantity("dam"))
 
 
diff --git a/sympy/core/tests/test_arit.py b/sympy/core/tests/test_arit.py
@@ -1,7 +1,6 @@
 from sympy import (Basic, Symbol, sin, cos, atan, exp, sqrt, Rational,
         Float, re, pi, sympify, Add, Mul, Pow, Mod, I, log, S, Max, symbols,
-        oo, zoo, Integer, sign, im, nan, Dummy, factorial, comp, refine,
-        floor
+        oo, zoo, Integer, sign, im, nan, Dummy, factorial, comp, floor
 )
 from sympy.core.compatibility import long, range
 from sympy.core.evaluate import distribute
diff --git a/sympy/core/tests/test_assumptions.py b/sympy/core/tests/test_assumptions.py
@@ -852,7 +852,6 @@ def test_Pow_is_algebraic():
 
 
 def test_Mul_is_prime_composite():
-    from sympy import Mul
     x = Symbol('x', positive=True, integer=True)
     y = Symbol('y', positive=True, integer=True)
     assert (x*y).is_prime is None
@@ -890,7 +889,6 @@ def test_Pow_is_pos_neg():
     assert (x**y).is_negative is False
 
 def test_Pow_is_prime_composite():
-    from sympy import Pow
     x = Symbol('x', positive=True, integer=True)
     y = Symbol('y', positive=True, integer=True)
     assert (x**y).is_prime is None
diff --git a/sympy/core/tests/test_complex.py b/sympy/core/tests/test_complex.py
@@ -1,7 +1,6 @@
 from sympy import (S, Symbol, sqrt, I, Integer, Rational, cos, sin, im, re, Abs,
         exp, sinh, cosh, tan, tanh, conjugate, sign, cot, coth, pi, symbols,
         expand_complex, Pow)
-from sympy.core.expr import unchanged
 
 def test_complex():
     a = Symbol("a", real=True)
diff --git a/sympy/core/tests/test_diff.py b/sympy/core/tests/test_diff.py
@@ -5,14 +5,12 @@
 from sympy.core.relational import Eq
 from sympy.core.singleton import S
 from sympy.core.symbol import Symbol
-from sympy.functions.combinatorial.factorials import (FallingFactorial,
-    factorial)
+from sympy.functions.combinatorial.factorials import factorial
 from sympy.functions.elementary.complexes import (im, re)
 from sympy.functions.elementary.exponential import (exp, log)
 from sympy.functions.elementary.miscellaneous import Max
 from sympy.functions.elementary.piecewise import Piecewise
 from sympy.functions.elementary.trigonometric import (cos, cot, sin, tan)
-from sympy.logic.boolalg import And
 from sympy.tensor.array.ndim_array import NDimArray
 from sympy.utilities.pytest import raises
 from sympy.abc import a, b, c, x, y, z
diff --git a/sympy/core/tests/test_evalf.py b/sympy/core/tests/test_evalf.py
@@ -2,7 +2,7 @@
     factorial, fibonacci, floor, Function, GoldenRatio, I, Integral,
     integrate, log, Mul, N, oo, pi, Pow, product, Product,
     Rational, S, Sum, simplify, sin, sqrt, sstr, sympify, Symbol, Max, nfloat, cosh, acosh, acos)
-from sympy.core.numbers import comp, Rational
+from sympy.core.numbers import comp
 from sympy.core.evalf import (complex_accuracy, PrecisionExhausted,
     scaled_zero, get_integer_part, as_mpmath, evalf)
 from mpmath import inf, ninf
diff --git a/sympy/core/tests/test_expr.py b/sympy/core/tests/test_expr.py
@@ -5,7 +5,7 @@
                    simplify, together, collect, factorial, apart, combsimp, factor, refine,
                    cancel, Tuple, default_sort_key, DiracDelta, gamma, Dummy, Sum, E,
                    exp_polar, expand, diff, O, Heaviside, Si, Max, UnevaluatedExpr,
-                   integrate, gammasimp, Gt, cot)
+                   integrate, gammasimp, Gt)
 from sympy.core.expr import ExprBuilder, unchanged
 from sympy.core.function import AppliedUndef
 from sympy.core.compatibility import range, round, PY3
@@ -132,9 +132,9 @@ def __float__(self):
 
 
 def dotest(s):
-    for x in all_objs:
-        for y in all_objs:
-            s(x, y)
+    for xo in all_objs:
+        for yo in all_objs:
+            s(xo, yo)
     return True
 
 
@@ -148,6 +148,7 @@ def j(a, b):
         x = a*b
         x = a/b
         x = a**b
+        del x
     assert dotest(j)
 
 
diff --git a/sympy/core/tests/test_function.py b/sympy/core/tests/test_function.py
@@ -872,15 +872,15 @@ def test_nfloat():
     assert str(nfloat(eq, exponent=False, n=1)) == '-0.7*cos(3.0*x**4 + y)'
 
     # issue 10933
-    for t in (dict, Dict):
-        d = t({S.Half: S.Half})
+    for ti in (dict, Dict):
+        d = ti({S.Half: S.Half})
         n = nfloat(d)
-        assert isinstance(n, t)
+        assert isinstance(n, ti)
         assert _aresame(list(n.items()).pop(), (S.Half, Float(.5)))
-    for t in (dict, Dict):
-        d = t({S.Half: S.Half})
+    for ti in (dict, Dict):
+        d = ti({S.Half: S.Half})
         n = nfloat(d, dkeys=True)
-        assert isinstance(n, t)
+        assert isinstance(n, ti)
         assert _aresame(list(n.items()).pop(), (Float(.5), Float(.5)))
     d = [S.Half]
     n = nfloat(d)
diff --git a/sympy/core/tests/test_numbers.py b/sympy/core/tests/test_numbers.py
@@ -8,7 +8,6 @@
                    AlgebraicNumber, simplify, sin, fibonacci, RealField,
                    sympify, srepr, Dummy, Sum)
 from sympy.core.compatibility import long
-from sympy.core.expr import unchanged
 from sympy.core.logic import fuzzy_not
 from sympy.core.numbers import (igcd, ilcm, igcdex, seterr,
     igcd2, igcd_lehmer, mpf_norm, comp, mod_inverse)
@@ -1274,9 +1273,9 @@ def test_bug_sqrt():
 
 def test_pi_Pi():
     "Test that pi (instance) is imported, but Pi (class) is not"
-    from sympy import pi
+    from sympy import pi  # noqa
     with raises(ImportError):
-        from sympy import Pi
+        from sympy import Pi  # noqa
 
 
 def test_no_len():
diff --git a/sympy/core/tests/test_power.py b/sympy/core/tests/test_power.py
@@ -1,6 +1,6 @@
 from sympy.core import (
     Rational, Symbol, S, Float, Integer, Mul, Number, Pow,
-    Basic, I, nan, pi, E, symbols, oo, zoo, Rational, N)
+    Basic, I, nan, pi, symbols, oo, zoo, Rational, N)
 from sympy.core.tests.test_evalf import NS
 from sympy.core.function import expand_multinomial
 from sympy.functions.elementary.complexes import Abs
@@ -10,7 +10,6 @@
 from sympy.functions.elementary.trigonometric import (
     sin, cos, tan, sec, csc, sinh, cosh, tanh, atan)
 from sympy.series.order import O
-from sympy.utilities.pytest import XFAIL
 
 
 def test_rational():
diff --git a/sympy/core/tests/test_relational.py b/sympy/core/tests/test_relational.py
@@ -830,7 +830,8 @@ def test_issue_10401():
     inf = symbols('inf', infinite=True)
     inf2 = symbols('inf2', infinite=True)
     infx = symbols('infx', infinite=True, extended_real=True)
-    infx2 = symbols('infx2', infinite=True, extended_real=True)
+    # Used in the commented tests below:
+    #infx2 = symbols('infx2', infinite=True, extended_real=True)
     infnx = symbols('inf~x', infinite=True, extended_real=False)
     infnx2 = symbols('inf~x2', infinite=True, extended_real=False)
     infp = symbols('infp', infinite=True, extended_positive=True)
diff --git a/sympy/core/tests/test_subs.py b/sympy/core/tests/test_subs.py
@@ -5,7 +5,7 @@
     Piecewise, oo, Mul, factor, nsimplify, zoo, Subs, RootOf,
     AccumBounds, Matrix, zeros, ZeroMatrix)
 from sympy.core.basic import _aresame
-from sympy.utilities.pytest import XFAIL, raises
+from sympy.utilities.pytest import XFAIL
 from sympy.abc import a, x, y, z
 
 
diff --git a/sympy/core/tests/test_symbol.py b/sympy/core/tests/test_symbol.py
@@ -1,6 +1,5 @@
 from sympy import (Symbol, Wild, GreaterThan, LessThan, StrictGreaterThan,
-    StrictLessThan, pi, I, Rational, sympify, symbols, Dummy, Tuple,
-)
+    StrictLessThan, pi, I, Rational, sympify, symbols, Dummy)
 from sympy.core.symbol import _uniquely_named_symbol, _symbol
 
 from sympy.utilities.pytest import raises
diff --git a/sympy/core/tests/test_sympify.py b/sympy/core/tests/test_sympify.py
@@ -1,5 +1,5 @@
 from sympy import (Symbol, exp, Integer, Float, sin, cos, log, Poly, Lambda,
-    Function, I, S, N, sqrt, srepr, Rational, Tuple, Matrix, Interval, Add, Mul,
+    Function, I, S, sqrt, srepr, Rational, Tuple, Matrix, Interval, Add, Mul,
     Pow, Or, true, false, Abs, pi, Range, Xor)
 from sympy.abc import x, y
 from sympy.core.sympify import (sympify, _sympify, SympifyError, kernS,
@@ -11,7 +11,7 @@
 from sympy.geometry import Point, Line
 from sympy.functions.combinatorial.factorials import factorial, factorial2
 from sympy.abc import _clash, _clash1, _clash2
-from sympy.core.compatibility import exec_, HAS_GMPY, PY3
+from sympy.core.compatibility import exec_, HAS_GMPY, range
 from sympy.sets import FiniteSet, EmptySet
 from sympy.tensor.array.dense_ndim_array import ImmutableDenseNDimArray
 
@@ -561,13 +561,8 @@ def test_issue_10295():
 
 def test_Range():
     # Only works in Python 3 where range returns a range type
-    if PY3:
-        builtin_range = range
-    else:
-        builtin_range = xrange
-
-    assert sympify(builtin_range(10)) == Range(10)
-    assert _sympify(builtin_range(10)) == Range(10)
+    assert sympify(range(10)) == Range(10)
+    assert _sympify(range(10)) == Range(10)
 
 
 def test_sympify_set():
diff --git a/sympy/core/tests/test_truediv.py b/sympy/core/tests/test_truediv.py
@@ -38,6 +38,7 @@ def s(a, b):
         x = a*b
         x = a/b
         x = a**b
+        del x
     assert dotest(s)
 
 
diff --git a/sympy/core/tests/test_var.py b/sympy/core/tests/test_var.py

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`from sympy import (Basic, Symbol, sin, cos, atan, exp, sqrt, Rational,`
`2`	`2`	`Float, re, pi, sympify, Add, Mul, Pow, Mod, I, log, S, Max, symbols,`
`3`		`- oo, zoo, Integer, sign, im, nan, Dummy, factorial, comp, refine,`
`4`		`- floor`
	`3`	`+ oo, zoo, Integer, sign, im, nan, Dummy, factorial, comp, floor`
`5`	`4`	`)`
`6`	`5`	`from sympy.core.compatibility import long, range`
`7`	`6`	`from sympy.core.evaluate import distribute`