sage.matrix: Consolidate imports from the same module

Author: Matthias Koeppe

src/sage/matrix/matrix_cyclo_dense.pyx

@@ -65,10 +65,9 @@ from .matrix_integer_dense cimport _lift_crt
 from sage.structure.element cimport Matrix as baseMatrix
 from .misc import matrix_integer_dense_rational_reconstruction
 
+from sage.arith.misc import binomial, previous_prime
 from sage.rings.rational_field import QQ
 from sage.rings.integer_ring import ZZ
-from sage.arith.misc import previous_prime
-from sage.arith.misc import binomial
 from sage.rings.real_mpfr import create_RealNumber as RealNumber
 from sage.rings.integer cimport Integer
 from sage.rings.rational cimport Rational

src/sage/matrix/matrix_integer_dense_hnf.py

@@ -8,15 +8,14 @@
 
 from copy import copy
 
+from sage.arith.misc import CRT_list, previous_prime
 from sage.misc.misc import cputime
 from sage.misc.verbose import verbose
-from sage.matrix.constructor import (random_matrix, matrix, identity_matrix)
-
+from sage.rings.integer import Integer
 from sage.rings.integer_ring import ZZ
 from sage.rings.real_mpfr import RR
-from sage.rings.integer import Integer
-from sage.arith.misc import previous_prime
-from sage.arith.misc import CRT_list
+
+from .constructor import identity_matrix, matrix, random_matrix
 
 
 def max_det_prime(n):

src/sage/matrix/matrix_integer_dense_saturation.py

@@ -2,15 +2,16 @@
 Saturation over ZZ
 """
 
-from sage.rings.integer_ring import ZZ
-from sage.rings.finite_rings.finite_field_constructor import FiniteField as GF
-from sage.arith.misc import binomial
-from sage.arith.misc import GCD as gcd
-from sage.matrix.constructor import identity_matrix, random_matrix
-from sage.misc.verbose import verbose
+from copy import copy
+
+from sage.arith.misc import binomial, GCD as gcd
 from sage.misc.randstate import current_randstate
+from sage.misc.verbose import verbose
+from sage.rings.finite_rings.finite_field_constructor import FiniteField as GF
+from sage.rings.integer_ring import ZZ
+
 from . import matrix_integer_dense_hnf
-from copy import copy
+from .constructor import identity_matrix, random_matrix
 
 
 def p_saturation(A, p, proof=True):

src/sage/matrix/misc.pyx

@@ -12,40 +12,33 @@ relevant classes and this file deleted.
 
 from cysignals.signals cimport sig_check
 
-from sage.ext.mod_int cimport *
-from sage.libs.gmp.mpz cimport *
-from sage.libs.gmp.mpq cimport *
-from sage.libs.mpfr cimport *
-
-from sage.libs.flint.fmpz cimport fmpz_set_mpz, fmpz_one
-from sage.libs.flint.fmpq cimport fmpq_set_mpq, fmpq_canonicalise
-from sage.libs.flint.fmpq_mat cimport fmpq_mat_entry_num, fmpq_mat_entry_den, fmpq_mat_entry
+cimport sage.rings.abc
 
+from sage.arith.misc import CRT_basis, previous_prime
 from sage.arith.rational_reconstruction cimport mpq_rational_reconstruction
-
 from sage.data_structures.binary_search cimport *
+from sage.ext.mod_int cimport *
+from sage.libs.flint.fmpq cimport fmpq_set_mpq, fmpq_canonicalise
+from sage.libs.flint.fmpq_mat cimport fmpq_mat_entry_num, fmpq_mat_entry_den, fmpq_mat_entry
+from sage.libs.flint.fmpz cimport fmpz_set_mpz, fmpz_one
+from sage.libs.gmp.mpq cimport *
+from sage.libs.gmp.mpz cimport *
+from sage.libs.mpfr cimport *
+from sage.misc.verbose import get_verbose, verbose
 from sage.modules.vector_integer_sparse cimport *
-from sage.modules.vector_rational_sparse cimport *
 from sage.modules.vector_modn_sparse cimport *
+from sage.modules.vector_rational_sparse cimport *
+from sage.rings.integer cimport Integer
+from sage.rings.integer_ring import ZZ
+from sage.rings.rational_field import QQ
+from sage.rings.real_mpfr cimport RealNumber
 
 from .matrix0 cimport Matrix
 from .matrix_integer_dense cimport Matrix_integer_dense
 from .matrix_integer_sparse cimport Matrix_integer_sparse
 from .matrix_rational_dense cimport Matrix_rational_dense
 from .matrix_rational_sparse cimport Matrix_rational_sparse
 
-from sage.rings.integer_ring   import ZZ
-from sage.rings.rational_field import QQ
-
-from sage.rings.integer cimport Integer
-from sage.arith.misc import previous_prime
-from sage.arith.misc import CRT_basis
-
-cimport sage.rings.abc
-from sage.rings.real_mpfr cimport RealNumber
-
-
-from sage.misc.verbose import verbose, get_verbose
 
 def matrix_integer_dense_rational_reconstruction(Matrix_integer_dense A, Integer N):
     """