summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrédéric Chapoton <chapoton@math.univ-lyon1.fr>2016-05-15 20:38:46 +0200
committerFrédéric Chapoton <chapoton@math.univ-lyon1.fr>2016-05-15 20:38:46 +0200
commita0ffe6363aea70a4f8a04822f9cc4c815edc9a50 (patch)
tree14a1fd755ef8e9efced00ff928ffdf3a9ea347aa
parentMerge branch 'public/ticket/16448' into 7.2.rc2 (diff)
trac 16448 modernising imports
-rw-r--r--src/sage/modular/jacobi/test_classical_weak.py21
-rw-r--r--src/sage/modular/jacobi/test_higherrank_dimension.py25
2 files changed, 28 insertions, 18 deletions
diff --git a/src/sage/modular/jacobi/test_classical_weak.py b/src/sage/modular/jacobi/test_classical_weak.py
index bcfe5f2..4df7963 100644
--- a/src/sage/modular/jacobi/test_classical_weak.py
+++ b/src/sage/modular/jacobi/test_classical_weak.py
@@ -26,14 +26,19 @@ AUTHOR:
#
#===============================================================================
-from sage.all import (PolynomialRing, LaurentPolynomialRing,
- PowerSeriesRing,
- ZZ, QQ, gcd,
- factorial,
- vector, span, FreeModule,
- matrix,
- ModularForms, Gamma1
-)
+from sage.arith.misc import gcd
+from sage.functions.other import factorial
+from sage.matrix.constructor import matrix
+from sage.modular.arithgroup.congroup_gamma1 import Gamma1
+from sage.modular.modform.constructor import ModularForms
+from sage.modules.free_module import span, FreeModule
+from sage.modules.free_module_element import vector
+from sage.rings.integer_ring import ZZ
+from sage.rings.polynomial.laurent_polynomial_ring import LaurentPolynomialRing
+from sage.rings.polynomial.polynomial_ring_constructor import PolynomialRing
+from sage.rings.power_series_ring import PowerSeriesRing
+from sage.rings.rational_field import QQ
+
from sage.modular.jacobi.classical_weak import (
classical_weak_jacobi_fe_indices,
diff --git a/src/sage/modular/jacobi/test_higherrank_dimension.py b/src/sage/modular/jacobi/test_higherrank_dimension.py
index 4aba45c..7b26436 100644
--- a/src/sage/modular/jacobi/test_higherrank_dimension.py
+++ b/src/sage/modular/jacobi/test_higherrank_dimension.py
@@ -25,12 +25,16 @@ AUTHOR:
#
#===============================================================================
-from sage.all import (prod, matrix,
- ZZ, ComplexField,
- gcd, lcm,
- QuadraticForm)
+from sage.arith.misc import gcd, lcm
+from sage.matrix.constructor import matrix
+from sage.misc.misc_c import prod
+from sage.quadratic_forms.quadratic_form import QuadraticForm
+from sage.rings.complex_field import ComplexField
+from sage.rings.integer_ring import ZZ
+
import operator
+
def _test_set__quadratic_forms():
r"""
A set of quadratic forms used in subsequent tests.
@@ -47,13 +51,14 @@ def _test_set__quadratic_forms():
QuadraticForm(-matrix(2, [2, 0, 0, 4])),
QuadraticForm(matrix(3, [2,1,1, 1,2,1, 1,1,2]))]
+
def test__discriminant_form():
r"""
Test discriminant forms. See individual tests for more details.
- .. NOTE:
+ .. NOTE::
- This is a test generator to be used by nosetest.
+ This is a test generator to be used by nosetest.
TESTS::
@@ -117,9 +122,9 @@ def test__discriminant_form_pmone():
r"""
Test meth:`discriminant_form_pmone`. See individual tests for more details.
- .. NOTE:
+ .. NOTE::
- This is a test generator to be used by nosetest.
+ This is a test generator to be used by nosetest.
TESTS::
@@ -158,9 +163,9 @@ def test__weil_representation():
r"""
Test Weil representation. See individual tests for more details.
- .. NOTE:
+ .. NOTE::
- This is a test generator to be used by nosetest.
+ This is a test generator to be used by nosetest.
TESTS::