From 9cf6f64b3d19d898fc3edf0fa895443e91e70f89 Mon Sep 17 00:00:00 2001
From: Ondrej Certik <ondrej@certik.cz>
Date: Sat, 2 Feb 2008 19:08:30 +0100
Subject: [PATCH] All "from sympy import *" rewritten to explicit imports
 (#670).

Except the numerics module, that is going to be removed anyway, since all
the functionality is (or should be) implemented in mpmath.
* * *
---
 sympy/concrete/tests/test_products.py                  | 3 +--
 sympy/core/tests/test_complex.py                       | 3 ++-
 sympy/core/tests/test_count_ops.py                     | 3 +--
 sympy/core/tests/test_eval.py                          | 2 +-
 sympy/functions/combinatorial/tests/test_factorials.py | 3 +--
 sympy/functions/combinatorial/tests/test_numbers.py    | 4 ++--
 sympy/functions/elementary/tests/test_complexes.py     | 2 +-
 sympy/functions/elementary/tests/test_exponential.py   | 2 +-
 sympy/functions/elementary/tests/test_hyperbolic.py    | 4 ++--
 sympy/functions/elementary/tests/test_integers.py      | 4 ++--
 sympy/functions/elementary/tests/test_trigonometric.py | 5 +++--
 sympy/functions/special/tests/test_error_functions.py  | 3 +--
 sympy/functions/special/tests/test_gamma_functions.py  | 4 ++--
 sympy/functions/special/tests/test_polynomials.py      | 4 +++-
 sympy/functions/special/tests/test_zeta_functions.py   | 3 +--
 sympy/geometry/tests/test_geometry.py                  | 6 ++++--
 sympy/integrals/tests/test_risch.py                    | 4 ++--
 sympy/matrices/tests/test_matrices.py                  | 5 ++---
 sympy/ntheory/tests/test_ntheory.py                    | 7 +++++--
 sympy/physics/tests/test_units.py                      | 2 +-
 sympy/plotting/tests/test_plotting.py                  | 2 +-
 sympy/printing/tests/test_latex.py                     | 3 ++-
 sympy/printing/tests/test_mathml.py                    | 2 +-
 sympy/printing/tests/test_pretty.py                    | 3 ++-
 sympy/printing/tests/test_pretty_unicode.py            | 3 ++-
 sympy/series/tests/test_limit_series.py                | 2 +-
 sympy/series/tests/test_oseries.py                     | 2 +-
 sympy/series/tests/test_series.py                      | 5 +++--
 sympy/simplify/tests/test_rootof.py                    | 3 +--
 sympy/simplify/tests/test_simplify.py                  | 5 +++--
 sympy/solvers/tests/test_recurr.py                     | 4 ++--
 sympy/solvers/tests/test_solvers.py                    | 4 ++--
 sympy/statistics/tests/test_statistics.py              | 4 ++--
 33 files changed, 61 insertions(+), 54 deletions(-)

diff --git a/sympy/concrete/tests/test_products.py b/sympy/concrete/tests/test_products.py
index 621e7bf..74dacd0 100644
--- a/sympy/concrete/tests/test_products.py
+++ b/sympy/concrete/tests/test_products.py
@@ -1,5 +1,4 @@
-
-from sympy import *
+from sympy import symbols, product, factorial, rf, Rational, sqrt, cos, Product
 
 a, k, n = symbols('akn', integer=True)
 
diff --git a/sympy/core/tests/test_complex.py b/sympy/core/tests/test_complex.py
index bdf638b..08a2cdf 100644
--- a/sympy/core/tests/test_complex.py
+++ b/sympy/core/tests/test_complex.py
@@ -1,4 +1,5 @@
-from sympy import *
+from sympy import Symbol, sqrt, I, Integer, Rational, cos, atan, sin, im, re, \
+        exp, sinh, cosh, tan, tanh, conjugate, sign, cot, coth
 
 
 def test_complex():
diff --git a/sympy/core/tests/test_count_ops.py b/sympy/core/tests/test_count_ops.py
index 368e3c8..9ef8ef0 100644
--- a/sympy/core/tests/test_count_ops.py
+++ b/sympy/core/tests/test_count_ops.py
@@ -1,5 +1,4 @@
-
-from sympy import *
+from sympy import symbols, sin, exp, cos
 
 x, y, z = symbols('xyz')
 
diff --git a/sympy/core/tests/test_eval.py b/sympy/core/tests/test_eval.py
index 986aba5..4cd9603 100644
--- a/sympy/core/tests/test_eval.py
+++ b/sympy/core/tests/test_eval.py
@@ -1,4 +1,4 @@
-from sympy import *
+from sympy import Symbol, Function, exp, sqrt, Rational, I, cos, tan
 from sympy.utilities.pytest import XFAIL
 
 
diff --git a/sympy/functions/combinatorial/tests/test_factorials.py b/sympy/functions/combinatorial/tests/test_factorials.py
index 0c3c75b..003ead0 100644
--- a/sympy/functions/combinatorial/tests/test_factorials.py
+++ b/sympy/functions/combinatorial/tests/test_factorials.py
@@ -1,5 +1,4 @@
-
-from sympy import *
+from sympy import symbols, rf, Symbol, factorial, Factorial, ff, nan, oo
 
 def test_rf_eval_apply():
 
diff --git a/sympy/functions/combinatorial/tests/test_numbers.py b/sympy/functions/combinatorial/tests/test_numbers.py
index f72c590..4566559 100644
--- a/sympy/functions/combinatorial/tests/test_numbers.py
+++ b/sympy/functions/combinatorial/tests/test_numbers.py
@@ -1,5 +1,5 @@
-
-from sympy import *
+from sympy import bernoulli, Symbol, harmonic, Rational, oo, zoo, pi, bell, \
+        fibonacci, lucas
 
 x = Symbol('x')
 
diff --git a/sympy/functions/elementary/tests/test_complexes.py b/sympy/functions/elementary/tests/test_complexes.py
index f735d79..1819973 100644
--- a/sympy/functions/elementary/tests/test_complexes.py
+++ b/sympy/functions/elementary/tests/test_complexes.py
@@ -1,4 +1,4 @@
-from sympy import *
+from sympy import symbols, Symbol, sqrt, oo, re, nan, im, sign, I, E, log, pi
 
 def test_re():
 
diff --git a/sympy/functions/elementary/tests/test_exponential.py b/sympy/functions/elementary/tests/test_exponential.py
index c0c353d..c0796a2 100644
--- a/sympy/functions/elementary/tests/test_exponential.py
+++ b/sympy/functions/elementary/tests/test_exponential.py
@@ -1,4 +1,4 @@
-from sympy import *
+from sympy import symbols, log, Real, nan, oo, I, pi, E, exp, Symbol
 from sympy.utilities.pytest import XFAIL
 
 def test_exp():
diff --git a/sympy/functions/elementary/tests/test_hyperbolic.py b/sympy/functions/elementary/tests/test_hyperbolic.py
index 93fa7ba..6ab4af0 100644
--- a/sympy/functions/elementary/tests/test_hyperbolic.py
+++ b/sympy/functions/elementary/tests/test_hyperbolic.py
@@ -1,5 +1,5 @@
-
-from sympy import *
+from sympy import symbols, Symbol, sinh, nan, oo, pi, asinh, log, sqrt, coth, \
+        I, cot, E, tanh, tan, cosh, cos, S, sin
 
 def test_sinh():
     x, y = symbols('xy')
diff --git a/sympy/functions/elementary/tests/test_integers.py b/sympy/functions/elementary/tests/test_integers.py
index 835b044..158fc25 100644
--- a/sympy/functions/elementary/tests/test_integers.py
+++ b/sympy/functions/elementary/tests/test_integers.py
@@ -1,5 +1,5 @@
-
-from sympy import *
+from sympy import Symbol, floor, nan, oo, E, symbols, ceiling, pi, Rational, \
+        Real, I, sin
 
 def test_floor():
 
diff --git a/sympy/functions/elementary/tests/test_trigonometric.py b/sympy/functions/elementary/tests/test_trigonometric.py
index 8ed8f99..594f490 100644
--- a/sympy/functions/elementary/tests/test_trigonometric.py
+++ b/sympy/functions/elementary/tests/test_trigonometric.py
@@ -1,5 +1,6 @@
-
-from sympy import *
+from sympy import symbols, Symbol, nan, oo, I, sinh, sin, acot, pi, atan, \
+        acos, Rational, sqrt, asin, acot, cot, coth, E, S, tan, tanh, cos, \
+        cosh
 
 def test_sin():
     x, y = symbols('xy')
diff --git a/sympy/functions/special/tests/test_error_functions.py b/sympy/functions/special/tests/test_error_functions.py
index 10fa888..3d0b5dd 100644
--- a/sympy/functions/special/tests/test_error_functions.py
+++ b/sympy/functions/special/tests/test_error_functions.py
@@ -1,5 +1,4 @@
-
-from sympy import *
+from sympy import symbols, erf, nan, oo, Real, sqrt, pi, O
 
 x, y = symbols('xy')
 
diff --git a/sympy/functions/special/tests/test_gamma_functions.py b/sympy/functions/special/tests/test_gamma_functions.py
index 9b4217b..57c0c70 100644
--- a/sympy/functions/special/tests/test_gamma_functions.py
+++ b/sympy/functions/special/tests/test_gamma_functions.py
@@ -1,5 +1,5 @@
-
-from sympy import *
+from sympy import Symbol, gamma, oo, nan, zoo, factorial, sqrt, Rational, \
+        polygamma, EulerGamma, pi, uppergamma
 
 x = Symbol('x')
 n = Symbol('n', integer=True)
diff --git a/sympy/functions/special/tests/test_polynomials.py b/sympy/functions/special/tests/test_polynomials.py
index 1dc0349..342fbee 100644
--- a/sympy/functions/special/tests/test_polynomials.py
+++ b/sympy/functions/special/tests/test_polynomials.py
@@ -1,4 +1,6 @@
-from sympy import *
+from sympy import legendre, Symbol, hermite, chebyshevu, chebyshevt, \
+        chebyshevt_root, chebyshevu_root, assoc_legendre, Rational, roots, \
+        sympify
 
 x = Symbol('x')
 
diff --git a/sympy/functions/special/tests/test_zeta_functions.py b/sympy/functions/special/tests/test_zeta_functions.py
index 700cb13..95e95a1 100644
--- a/sympy/functions/special/tests/test_zeta_functions.py
+++ b/sympy/functions/special/tests/test_zeta_functions.py
@@ -1,5 +1,4 @@
-
-from sympy import *
+from sympy import Symbol, zeta, nan, Rational, pi, dirichlet_eta, log, zoo
 
 x = Symbol('x')
 
diff --git a/sympy/geometry/tests/test_geometry.py b/sympy/geometry/tests/test_geometry.py
index 5a44736..6db7bc3 100644
--- a/sympy/geometry/tests/test_geometry.py
+++ b/sympy/geometry/tests/test_geometry.py
@@ -1,6 +1,8 @@
 import py
-from sympy import *
-from sympy.geometry import *
+from sympy import Symbol, Rational, sqrt, pi, cos, oo, simplify, Real
+from sympy.geometry import Point, Polygon, convex_hull, Segment, \
+        RegularPolygon, Circle, Ellipse, GeometryError, Line, intersection, \
+        Ray, Triangle, are_similar
 
 x = Symbol('x', real=True)
 y = Symbol('y', real=True)
diff --git a/sympy/integrals/tests/test_risch.py b/sympy/integrals/tests/test_risch.py
index 49900d4..38e3b9a 100644
--- a/sympy/integrals/tests/test_risch.py
+++ b/sympy/integrals/tests/test_risch.py
@@ -1,5 +1,5 @@
-
-from sympy import *
+from sympy import Rational, sqrt, symbols, sin, exp, log, sinh, cosh, cos, pi, \
+        I, S, erf
 from sympy.integrals.risch import heurisch, components
 from sympy.utilities.pytest import XFAIL
 from py.test import skip
diff --git a/sympy/matrices/tests/test_matrices.py b/sympy/matrices/tests/test_matrices.py
index 2758f2e..d9f7c9a 100644
--- a/sympy/matrices/tests/test_matrices.py
+++ b/sympy/matrices/tests/test_matrices.py
@@ -1,6 +1,5 @@
-
-from sympy import *
-from sympy import symbols
+from sympy import symbols, Matrix, eye, I, Symbol, Rational, wronskian, cos, \
+        sin, exp, hessian, sqrt, zero, randMatrix
 from sympy.matrices.matrices import ShapeError
 from sympy.utilities.test import REPR0
 import py
diff --git a/sympy/ntheory/tests/test_ntheory.py b/sympy/ntheory/tests/test_ntheory.py
index ccfe609..1b2293b 100644
--- a/sympy/ntheory/tests/test_ntheory.py
+++ b/sympy/ntheory/tests/test_ntheory.py
@@ -1,6 +1,9 @@
 import py
-from sympy import *
-from sympy.ntheory import *
+from sympy import Sieve
+from sympy.ntheory import isprime, n_order, is_primitive_root, \
+    is_quad_residue, legendre_symbol, npartitions, totient, trial, \
+    factorint, primefactors, divisors, randprime, nextprime, prevprime, \
+    primerange, primepi, prime
 
 def test_isprime():
     s = Sieve()
diff --git a/sympy/physics/tests/test_units.py b/sympy/physics/tests/test_units.py
index 610fa4a..fd00dc5 100644
--- a/sympy/physics/tests/test_units.py
+++ b/sympy/physics/tests/test_units.py
@@ -1,4 +1,4 @@
-from sympy import *
+from sympy import Rational
 from sympy.physics.units import *
 
 def test_units():
diff --git a/sympy/plotting/tests/test_plotting.py b/sympy/plotting/tests/test_plotting.py
index faa26ea..1811e8c 100644
--- a/sympy/plotting/tests/test_plotting.py
+++ b/sympy/plotting/tests/test_plotting.py
@@ -8,7 +8,7 @@ try:
 except:
     disabled = True
 
-from sympy import *
+from sympy import symbols, sin, cos
 x,y = symbols('xy')
 
 class TestPlotting:
diff --git a/sympy/printing/tests/test_latex.py b/sympy/printing/tests/test_latex.py
index c320aa0..46687e0 100644
--- a/sympy/printing/tests/test_latex.py
+++ b/sympy/printing/tests/test_latex.py
@@ -1,6 +1,7 @@
 import py
 
-from sympy import *
+from sympy import symbols, Rational, Symbol, Integral, log, diff, sin, exp, \
+        Function, factorial
 from sympy.abc import mu, tau
 from sympy.printing.latex import latex
 from sympy.utilities.pytest import XFAIL
diff --git a/sympy/printing/tests/test_mathml.py b/sympy/printing/tests/test_mathml.py
index 8d65ccc..32943b6 100644
--- a/sympy/printing/tests/test_mathml.py
+++ b/sympy/printing/tests/test_mathml.py
@@ -1,4 +1,4 @@
-from sympy import *
+from sympy import Symbol, sin, diff
 from sympy.printing.mathml import mathml, MathMLPrinter
 from xml.dom.minidom import parseString
 from sympy.utilities.pytest import XFAIL
diff --git a/sympy/printing/tests/test_pretty.py b/sympy/printing/tests/test_pretty.py
index 1cb7830..da0f05d 100644
--- a/sympy/printing/tests/test_pretty.py
+++ b/sympy/printing/tests/test_pretty.py
@@ -1,4 +1,5 @@
-from sympy import *
+from sympy import Symbol, Matrix, Integral, log, Rational, Derivative, exp, \
+        sqrt, pi, Function, sin, pprint_use_unicode, oo
 from sympy.printing.pretty import pretty
 from sympy.utilities.pytest import XFAIL
 
diff --git a/sympy/printing/tests/test_pretty_unicode.py b/sympy/printing/tests/test_pretty_unicode.py
index 8c73336..8fafc03 100644
--- a/sympy/printing/tests/test_pretty_unicode.py
+++ b/sympy/printing/tests/test_pretty_unicode.py
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 
-from sympy import *
+from sympy import symbols, Symbol, sin, cos, Matrix, Integral, pi, sqrt, \
+        Function, Rational, tan, oo
 from sympy.printing.pretty import pretty
 
 x,y = symbols('xy')
diff --git a/sympy/series/tests/test_limit_series.py b/sympy/series/tests/test_limit_series.py
index 7f5196c..5d7e99b 100644
--- a/sympy/series/tests/test_limit_series.py
+++ b/sympy/series/tests/test_limit_series.py
@@ -2,7 +2,7 @@
 # complicated don't, they are commented out. Use the general limit algorithm
 # for those, see limits.py. Ideally, we'll get rid of limits_series completely.
 
-from sympy import *
+from sympy import Symbol, S, exp, ln, sin, oo, Rational, log
 from sympy.series.limits_series import mrv_compare, mrv2
 from sympy.utilities.pytest import XFAIL
 
diff --git a/sympy/series/tests/test_oseries.py b/sympy/series/tests/test_oseries.py
index b4b5aa7..afaa3a9 100644
--- a/sympy/series/tests/test_oseries.py
+++ b/sympy/series/tests/test_oseries.py
@@ -1,4 +1,4 @@
-from sympy import *
+from sympy import Symbol, S, Rational, ln, exp, log, sqrt, E
 
 x = Symbol('x')
 y = Symbol('y')
diff --git a/sympy/series/tests/test_series.py b/sympy/series/tests/test_series.py
index 25528b6..4c1c7b2 100644
--- a/sympy/series/tests/test_series.py
+++ b/sympy/series/tests/test_series.py
@@ -1,8 +1,9 @@
 import py
-import sympy as g
-from sympy import *
+from sympy import Symbol, sin, cos, Rational, sqrt, exp, sinh, cosh, tanh, \
+        coth, asinh, acosh, atanh, acoth, pi, I
 from sympy.utilities.pytest import XFAIL
 from sympy import O
+#from sympy.core.power import pole_error
 
 def testseries1():
     x = Symbol("x")
diff --git a/sympy/simplify/tests/test_rootof.py b/sympy/simplify/tests/test_rootof.py
index bc68300..0b142dd 100644
--- a/sympy/simplify/tests/test_rootof.py
+++ b/sympy/simplify/tests/test_rootof.py
@@ -1,5 +1,4 @@
-
-from sympy import *
+from sympy import Rational, symbols, I, sin, cos, pi
 from sympy.simplify.rootof import roots, RootOf
 
 def test_roots():
diff --git a/sympy/simplify/tests/test_simplify.py b/sympy/simplify/tests/test_simplify.py
index 5467bb1..cbc10e3 100644
--- a/sympy/simplify/tests/test_simplify.py
+++ b/sympy/simplify/tests/test_simplify.py
@@ -1,5 +1,6 @@
-
-from sympy import *
+from sympy import Symbol, symbols, together, hypersimp, factorial, binomial, \
+        collect, Function, powsimp, separate, sin, exp, Rational, fraction, \
+        simplify, trigsimp, cos, tan, cot, log, ratsimp
 from sympy.utilities.pytest import XFAIL
 
 def test_ratsimp():
diff --git a/sympy/solvers/tests/test_recurr.py b/sympy/solvers/tests/test_recurr.py
index eb24d59..facc3e9 100644
--- a/sympy/solvers/tests/test_recurr.py
+++ b/sympy/solvers/tests/test_recurr.py
@@ -1,5 +1,5 @@
-
-from sympy import *
+from sympy import symbols, rsolve_hyper, rsolve_poly, rsolve_ratio, S, sqrt, \
+        rf, factorial
 
 n, k = symbols('nk', integer=True)
 C0, C1, C2 = symbols('C0', 'C1', 'C2')
diff --git a/sympy/solvers/tests/test_solvers.py b/sympy/solvers/tests/test_solvers.py
index 849eda8..ea7763c 100644
--- a/sympy/solvers/tests/test_solvers.py
+++ b/sympy/solvers/tests/test_solvers.py
@@ -1,5 +1,5 @@
-
-from sympy import *
+from sympy import solve, Function, Symbol, Derivative, exp, sin, cos, log, \
+        Rational
 from sympy.utilities.pytest import XFAIL
 
 from sympy.matrices import Matrix
diff --git a/sympy/statistics/tests/test_statistics.py b/sympy/statistics/tests/test_statistics.py
index 387de51..6a874b4 100644
--- a/sympy/statistics/tests/test_statistics.py
+++ b/sympy/statistics/tests/test_statistics.py
@@ -1,7 +1,7 @@
-from sympy import *
+from sympy import sqrt, Rational, oo
 from sympy.numerics import Float
 from sympy.functions import erf
-from sympy.statistics import *
+from sympy.statistics import Normal, Uniform
 import operator # XXX weird abs/sympy.abs conflict
 
 def test_normal():
-- 
2.11.4.GIT