34283: initial

src/sage/matrix/matrix_space.py

@@ -36,9 +36,7 @@
 import sys
 import operator
 
-# Sage matrix imports
-from . import matrix_generic_dense
-from . import matrix_generic_sparse
+# Sage matrix imports see :trac:`34283`
 
 # Sage imports
 import sage.structure.coerce
@@ -189,6 +187,8 @@ def get_matrix_class(R, nrows, ncols, sparse, implementation):
     if isinstance(implementation, type):
         return implementation
 
+    from sage.matrix.matrix_generic_dense import Matrix_generic_dense
+    from sage.matrix.matrix_generic_sparse import Matrix_generic_sparse
     if not sparse:
         if implementation is None:
             # Choose default implementation:
@@ -303,7 +303,7 @@ def get_matrix_class(R, nrows, ncols, sparse, implementation):
                         return matrix_mpolynomial_dense.Matrix_mpolynomial_dense
 
             # The fallback
-            return matrix_generic_dense.Matrix_generic_dense
+            return Matrix_generic_dense
 
         # Deal with request for a specific implementation
         if implementation == 'flint':
@@ -360,7 +360,7 @@ def get_matrix_class(R, nrows, ncols, sparse, implementation):
             raise ValueError("'linbox-double' matrices can only deal with order < %s" % matrix_modn_dense_double.MAX_MODULUS)
 
         if implementation == 'generic':
-            return matrix_generic_dense.Matrix_generic_dense
+            return Matrix_generic_dense
 
         if implementation == 'gap':
             from .matrix_gap import Matrix_gap
@@ -402,7 +402,7 @@ def get_matrix_class(R, nrows, ncols, sparse, implementation):
         return matrix_double_sparse.Matrix_double_sparse
 
     # the fallback
-    return matrix_generic_sparse.Matrix_generic_sparse
+    return Matrix_generic_sparse