diff --git a/src/module_list.py b/src/module_list.py index 3245d07076d..3f583bb0bca 100644 --- a/src/module_list.py +++ b/src/module_list.py @@ -1086,9 +1086,6 @@ def uname_specific(name, value, alternative): ## ################################ - Extension('sage.modules.binary_search', - sources = ['sage/modules/binary_search.pyx']), - Extension('sage.modules.vector_rational_sparse', sources = ['sage/modules/vector_rational_sparse.pyx']), diff --git a/src/sage/modules/binary_search.pxd b/src/sage/data_structures/binary_search.pxd similarity index 100% rename from src/sage/modules/binary_search.pxd rename to src/sage/data_structures/binary_search.pxd diff --git a/src/sage/modules/binary_search.pyx b/src/sage/data_structures/binary_search.pyx similarity index 100% rename from src/sage/modules/binary_search.pyx rename to src/sage/data_structures/binary_search.pyx diff --git a/src/sage/matrix/matrix_integer_sparse.pyx b/src/sage/matrix/matrix_integer_sparse.pyx index 75f7aef0b1b..58773bf25e5 100644 --- a/src/sage/matrix/matrix_integer_sparse.pyx +++ b/src/sage/matrix/matrix_integer_sparse.pyx @@ -21,7 +21,7 @@ TESTS:: # http://www.gnu.org/licenses/ ############################################################################## -from sage.modules.binary_search cimport * +from sage.data_structures.binary_search cimport * from sage.modules.vector_integer_sparse cimport * from sage.modules.vector_modn_sparse cimport * diff --git a/src/sage/matrix/matrix_modn_sparse.pyx b/src/sage/matrix/matrix_modn_sparse.pyx index afbb7a52421..7184e8ba626 100644 --- a/src/sage/matrix/matrix_modn_sparse.pyx +++ b/src/sage/matrix/matrix_modn_sparse.pyx @@ -99,7 +99,7 @@ from sage.structure.element import is_Vector cimport sage.structure.element -from sage.modules.binary_search cimport * +from sage.data_structures.binary_search cimport * from sage.modules.vector_integer_sparse cimport * from matrix_integer_sparse cimport Matrix_integer_sparse diff --git a/src/sage/matrix/matrix_rational_sparse.pyx b/src/sage/matrix/matrix_rational_sparse.pyx index 1ac1902086f..eb6a67283a6 100644 --- a/src/sage/matrix/matrix_rational_sparse.pyx +++ b/src/sage/matrix/matrix_rational_sparse.pyx @@ -21,7 +21,7 @@ TESTS:: # http://www.gnu.org/licenses/ ############################################################################## -from sage.modules.binary_search cimport * +from sage.data_structures.binary_search cimport * from sage.modules.vector_integer_sparse cimport * from sage.modules.vector_rational_sparse cimport * diff --git a/src/sage/matrix/misc.pyx b/src/sage/matrix/misc.pyx index fc664591ffa..a57ad4f2ad0 100644 --- a/src/sage/matrix/misc.pyx +++ b/src/sage/matrix/misc.pyx @@ -18,7 +18,7 @@ from sage.ext.mod_int cimport * from sage.libs.mpfr cimport * from sage.libs.gmp.rational_reconstruction cimport mpq_rational_reconstruction -from sage.modules.binary_search cimport * +from sage.data_structures.binary_search cimport * from sage.modules.vector_integer_sparse cimport * from sage.modules.vector_rational_sparse cimport * from sage.modules.vector_modn_sparse cimport * diff --git a/src/sage/modules/vector_integer_sparse.pyx b/src/sage/modules/vector_integer_sparse.pyx index b9c4145156b..738e130095e 100644 --- a/src/sage/modules/vector_integer_sparse.pyx +++ b/src/sage/modules/vector_integer_sparse.pyx @@ -5,7 +5,7 @@ ############################################################# from sage.libs.gmp.mpz cimport * -from sage.modules.binary_search cimport * +from sage.data_structures.binary_search cimport * from sage.rings.integer cimport Integer diff --git a/src/sage/modules/vector_rational_sparse.pyx b/src/sage/modules/vector_rational_sparse.pyx index d97ad3c9c13..6914fbe752c 100644 --- a/src/sage/modules/vector_rational_sparse.pyx +++ b/src/sage/modules/vector_rational_sparse.pyx @@ -7,7 +7,7 @@ include "cysignals/memory.pxi" from sage.libs.gmp.mpq cimport * -from sage.modules.binary_search cimport * +from sage.data_structures.binary_search cimport * from sage.rings.rational cimport Rational