diff --git a/src/sage/algebras/quatalg/quaternion_algebra_cython.pyx b/src/sage/algebras/quatalg/quaternion_algebra_cython.pyx index 983e2515c04..130c9f5d43a 100644 --- a/src/sage/algebras/quatalg/quaternion_algebra_cython.pyx +++ b/src/sage/algebras/quatalg/quaternion_algebra_cython.pyx @@ -35,7 +35,7 @@ from sage.matrix.matrix_space import MatrixSpace from sage.matrix.matrix_integer_dense cimport Matrix_integer_dense from sage.matrix.matrix_rational_dense cimport Matrix_rational_dense -from .quaternion_algebra_element cimport QuaternionAlgebraElement_rational_field +from sage.algebras.quatalg.quaternion_algebra_element cimport QuaternionAlgebraElement_rational_field from sage.libs.gmp.mpz cimport mpz_t, mpz_lcm, mpz_init, mpz_set, mpz_clear, mpz_init_set, mpz_mul, mpz_fdiv_q, mpz_cmp_si diff --git a/src/sage/arith/power.pyx b/src/sage/arith/power.pyx index d05b299de06..85096b6c703 100644 --- a/src/sage/arith/power.pyx +++ b/src/sage/arith/power.pyx @@ -18,7 +18,7 @@ square-and-multiply algorithm. from cysignals.signals cimport sig_check -from .long cimport integer_check_long +from sage.arith.long cimport integer_check_long cpdef generic_power(a, n): diff --git a/src/sage/categories/action.pxd b/src/sage/categories/action.pxd index 781ab857886..0cedf7be6b5 100644 --- a/src/sage/categories/action.pxd +++ b/src/sage/categories/action.pxd @@ -1,8 +1,8 @@ # sage_setup: distribution = sagemath-objects from sage.structure.element cimport Element -from .morphism cimport Morphism -from .map cimport Map -from .functor cimport Functor +from sage.categories.morphism cimport Morphism +from sage.categories.map cimport Map +from sage.categories.functor cimport Functor cdef class Action(Functor): cdef readonly G diff --git a/src/sage/categories/action.pyx b/src/sage/categories/action.pyx index f543b8c3675..a09dab3a20e 100644 --- a/src/sage/categories/action.pyx +++ b/src/sage/categories/action.pyx @@ -57,9 +57,9 @@ AUTHOR: from cpython.tuple cimport PyTuple_GET_ITEM -from .functor cimport Functor -from .morphism cimport Morphism -from .map cimport Map +from sage.categories.functor cimport Functor +from sage.categories.morphism cimport Morphism +from sage.categories.map cimport Map from sage.structure.element cimport parent from sage.structure.parent cimport Parent diff --git a/src/sage/categories/morphism.pxd b/src/sage/categories/morphism.pxd index 1d79b681cca..fea63dbd725 100644 --- a/src/sage/categories/morphism.pxd +++ b/src/sage/categories/morphism.pxd @@ -1,6 +1,6 @@ # sage_setup: distribution = sagemath-objects from sage.structure.element cimport Element -from .map cimport Map +from sage.categories.map cimport Map cdef class Morphism(Map): diff --git a/src/sage/combinat/designs/orthogonal_arrays_find_recursive.pyx b/src/sage/combinat/designs/orthogonal_arrays_find_recursive.pyx index e4979a63283..dba5e675148 100644 --- a/src/sage/combinat/designs/orthogonal_arrays_find_recursive.pyx +++ b/src/sage/combinat/designs/orthogonal_arrays_find_recursive.pyx @@ -949,7 +949,7 @@ cpdef find_brouwer_van_rees_with_one_truncated_column(int k,int n): return False -from .designs_pyx cimport _OA_cache, _OA_cache_size +from sage.combinat.designs.designs_pyx cimport _OA_cache, _OA_cache_size cdef int is_available(int k,int n) except -1: r""" Return whether Sage can build an OA(k,n) diff --git a/src/sage/cpython/debug.pyx b/src/sage/cpython/debug.pyx index 9a562db5ce3..72da44796ba 100644 --- a/src/sage/cpython/debug.pyx +++ b/src/sage/cpython/debug.pyx @@ -22,7 +22,7 @@ cdef extern from "Python.h": cdef extern from "sage/cpython/debugimpl.c": void _type_debug(PyTypeObject*) -from .getattr cimport AttributeErrorMessage +from sage.cpython.getattr cimport AttributeErrorMessage # Determine subtype_traverse, subtype_clear, subtype_dealloc functions diff --git a/src/sage/cpython/getattr.pyx b/src/sage/cpython/getattr.pyx index f7d6bdf718d..8aae65f63d3 100644 --- a/src/sage/cpython/getattr.pyx +++ b/src/sage/cpython/getattr.pyx @@ -5,7 +5,7 @@ Variants of getattr() from cpython.object cimport PyObject, PyTypeObject, Py_TYPE, descrgetfunc -from .string cimport bytes_to_str +from sage.cpython.string cimport bytes_to_str cdef extern from "Python.h": r""" diff --git a/src/sage/data_structures/bitset.pxd b/src/sage/data_structures/bitset.pxd index 1ad0b1da1f8..04016e50e6e 100644 --- a/src/sage/data_structures/bitset.pxd +++ b/src/sage/data_structures/bitset.pxd @@ -8,7 +8,7 @@ # http://www.gnu.org/licenses/ #***************************************************************************** -from .bitset_base cimport bitset_t +from sage.data_structures.bitset_base cimport bitset_t # Python layer over bitset_t cdef class FrozenBitset: diff --git a/src/sage/data_structures/bitset.pyx b/src/sage/data_structures/bitset.pyx index 05855bd6b42..fca0d9119a2 100644 --- a/src/sage/data_structures/bitset.pyx +++ b/src/sage/data_structures/bitset.pyx @@ -32,7 +32,7 @@ linear in ``capacity``. # http://www.gnu.org/licenses/ #***************************************************************************** -from .bitset_base cimport * +from sage.data_structures.bitset_base cimport * from cpython.object cimport Py_LT, Py_LE, Py_EQ, Py_NE, Py_GT, Py_GE diff --git a/src/sage/geometry/polyhedron/combinatorial_polyhedron/base.pxd b/src/sage/geometry/polyhedron/combinatorial_polyhedron/base.pxd index 271a99f40af..0cde636133d 100644 --- a/src/sage/geometry/polyhedron/combinatorial_polyhedron/base.pxd +++ b/src/sage/geometry/polyhedron/combinatorial_polyhedron/base.pxd @@ -2,10 +2,10 @@ cimport cython from sage.data_structures.list_of_pairs cimport ListOfPairs from sage.structure.sage_object cimport SageObject -from .face_iterator cimport FaceIterator, CombinatorialFace -from .list_of_faces cimport ListOfFaces -from .face_data_structure cimport face_t -from .polyhedron_face_lattice cimport PolyhedronFaceLattice +from sage.geometry.polyhedron.combinatorial_polyhedron.face_iterator cimport FaceIterator, CombinatorialFace +from sage.geometry.polyhedron.combinatorial_polyhedron.list_of_faces cimport ListOfFaces +from sage.geometry.polyhedron.combinatorial_polyhedron.face_data_structure cimport face_t +from sage.geometry.polyhedron.combinatorial_polyhedron.polyhedron_face_lattice cimport PolyhedronFaceLattice @cython.final cdef class CombinatorialPolyhedron(SageObject): diff --git a/src/sage/geometry/polyhedron/combinatorial_polyhedron/base.pyx b/src/sage/geometry/polyhedron/combinatorial_polyhedron/base.pyx index a556d3b6e2d..5c83504ca23 100644 --- a/src/sage/geometry/polyhedron/combinatorial_polyhedron/base.pyx +++ b/src/sage/geometry/polyhedron/combinatorial_polyhedron/base.pyx @@ -97,14 +97,14 @@ from .conversions \ incidence_matrix_to_bit_rep_of_Vrep, \ facets_tuple_to_bit_rep_of_facets, \ facets_tuple_to_bit_rep_of_Vrep -from .conversions cimport Vrep_list_to_bit_rep +from sage.geometry.polyhedron.combinatorial_polyhedron.conversions cimport Vrep_list_to_bit_rep from sage.misc.cachefunc import cached_method from sage.rings.integer cimport smallInteger from cysignals.signals cimport sig_check -from .face_data_structure cimport face_len_atoms, face_init, face_free -from .face_iterator cimport iter_t, parallel_f_vector +from sage.geometry.polyhedron.combinatorial_polyhedron.face_data_structure cimport face_len_atoms, face_init, face_free +from sage.geometry.polyhedron.combinatorial_polyhedron.face_iterator cimport iter_t, parallel_f_vector cdef extern from "Python.h": diff --git a/src/sage/geometry/polyhedron/combinatorial_polyhedron/combinatorial_face.pxd b/src/sage/geometry/polyhedron/combinatorial_polyhedron/combinatorial_face.pxd index 95e7d494c3c..ccb0ad1692e 100644 --- a/src/sage/geometry/polyhedron/combinatorial_polyhedron/combinatorial_face.pxd +++ b/src/sage/geometry/polyhedron/combinatorial_polyhedron/combinatorial_face.pxd @@ -1,9 +1,9 @@ # sage_setup: distribution = sagemath-polyhedra cimport cython from sage.structure.sage_object cimport SageObject -from .list_of_faces cimport ListOfFaces -from .face_data_structure cimport face_t -from .face_iterator cimport FaceIterator +from sage.geometry.polyhedron.combinatorial_polyhedron.list_of_faces cimport ListOfFaces +from sage.geometry.polyhedron.combinatorial_polyhedron.face_data_structure cimport face_t +from sage.geometry.polyhedron.combinatorial_polyhedron.face_iterator cimport FaceIterator @cython.final cdef class CombinatorialFace(SageObject): diff --git a/src/sage/geometry/polyhedron/combinatorial_polyhedron/combinatorial_face.pyx b/src/sage/geometry/polyhedron/combinatorial_polyhedron/combinatorial_face.pyx index b80aec3517a..8cdaedbfdc4 100644 --- a/src/sage/geometry/polyhedron/combinatorial_polyhedron/combinatorial_face.pyx +++ b/src/sage/geometry/polyhedron/combinatorial_polyhedron/combinatorial_face.pyx @@ -69,13 +69,13 @@ from cysignals.memory cimport check_allocarray, sig_free import numbers from sage.rings.integer cimport smallInteger -from .conversions cimport bit_rep_to_Vrep_list -from .base cimport CombinatorialPolyhedron -from .face_iterator cimport FaceIterator_base, FaceStatus -from .polyhedron_face_lattice cimport PolyhedronFaceLattice -from .face_data_structure cimport face_len_atoms, face_init, face_free, face_copy, face_issubset -from .face_list_data_structure cimport bit_rep_to_coatom_rep -from .list_of_faces cimport face_as_combinatorial_polyhedron +from sage.geometry.polyhedron.combinatorial_polyhedron.conversions cimport bit_rep_to_Vrep_list +from sage.geometry.polyhedron.combinatorial_polyhedron.base cimport CombinatorialPolyhedron +from sage.geometry.polyhedron.combinatorial_polyhedron.face_iterator cimport FaceIterator_base, FaceStatus +from sage.geometry.polyhedron.combinatorial_polyhedron.polyhedron_face_lattice cimport PolyhedronFaceLattice +from sage.geometry.polyhedron.combinatorial_polyhedron.face_data_structure cimport face_len_atoms, face_init, face_free, face_copy, face_issubset +from sage.geometry.polyhedron.combinatorial_polyhedron.face_list_data_structure cimport bit_rep_to_coatom_rep +from sage.geometry.polyhedron.combinatorial_polyhedron.list_of_faces cimport face_as_combinatorial_polyhedron cdef extern from "Python.h": diff --git a/src/sage/geometry/polyhedron/combinatorial_polyhedron/conversions.pxd b/src/sage/geometry/polyhedron/combinatorial_polyhedron/conversions.pxd index 6fea02d9ffe..93f272f50d8 100644 --- a/src/sage/geometry/polyhedron/combinatorial_polyhedron/conversions.pxd +++ b/src/sage/geometry/polyhedron/combinatorial_polyhedron/conversions.pxd @@ -1,5 +1,5 @@ # sage_setup: distribution = sagemath-polyhedra -from .face_list_data_structure cimport face_t +from sage.geometry.polyhedron.combinatorial_polyhedron.face_list_data_structure cimport face_t cdef int Vrep_list_to_bit_rep(tuple Vrep_list, face_t output) except -1 diff --git a/src/sage/geometry/polyhedron/combinatorial_polyhedron/conversions.pyx b/src/sage/geometry/polyhedron/combinatorial_polyhedron/conversions.pyx index be48243fc71..c933a2a75e4 100644 --- a/src/sage/geometry/polyhedron/combinatorial_polyhedron/conversions.pyx +++ b/src/sage/geometry/polyhedron/combinatorial_polyhedron/conversions.pyx @@ -73,8 +73,8 @@ from memory_allocator cimport MemoryAllocator from sage.matrix.matrix_dense cimport Matrix_dense -from .list_of_faces cimport ListOfFaces -from .face_data_structure cimport face_next_atom, face_add_atom_safe, facet_set_coatom, face_clear +from sage.geometry.polyhedron.combinatorial_polyhedron.list_of_faces cimport ListOfFaces +from sage.geometry.polyhedron.combinatorial_polyhedron.face_data_structure cimport face_next_atom, face_add_atom_safe, facet_set_coatom, face_clear cdef extern from "Python.h": int unlikely(int) nogil # Defined by Cython diff --git a/src/sage/geometry/polyhedron/combinatorial_polyhedron/face_iterator.pxd b/src/sage/geometry/polyhedron/combinatorial_polyhedron/face_iterator.pxd index b8ce23e08c7..a27274ed205 100644 --- a/src/sage/geometry/polyhedron/combinatorial_polyhedron/face_iterator.pxd +++ b/src/sage/geometry/polyhedron/combinatorial_polyhedron/face_iterator.pxd @@ -1,10 +1,10 @@ # sage_setup: distribution = sagemath-polyhedra cimport cython from sage.structure.sage_object cimport SageObject -from .list_of_faces cimport ListOfFaces -from .face_data_structure cimport face_t -from .face_list_data_structure cimport face_list_t -from .combinatorial_face cimport CombinatorialFace +from sage.geometry.polyhedron.combinatorial_polyhedron.list_of_faces cimport ListOfFaces +from sage.geometry.polyhedron.combinatorial_polyhedron.face_data_structure cimport face_t +from sage.geometry.polyhedron.combinatorial_polyhedron.face_list_data_structure cimport face_list_t +from sage.geometry.polyhedron.combinatorial_polyhedron.combinatorial_face cimport CombinatorialFace cdef enum FaceStatus: NOT_INITIALIZED diff --git a/src/sage/geometry/polyhedron/combinatorial_polyhedron/face_iterator.pyx b/src/sage/geometry/polyhedron/combinatorial_polyhedron/face_iterator.pyx index 8916acae481..d2edbb28de4 100644 --- a/src/sage/geometry/polyhedron/combinatorial_polyhedron/face_iterator.pyx +++ b/src/sage/geometry/polyhedron/combinatorial_polyhedron/face_iterator.pyx @@ -182,9 +182,9 @@ from memory_allocator cimport MemoryAllocator from sage.misc.lazy_import import LazyImport -from .conversions cimport bit_rep_to_Vrep_list -from .base cimport CombinatorialPolyhedron -from .face_list_data_structure cimport * +from sage.geometry.polyhedron.combinatorial_polyhedron.conversions cimport bit_rep_to_Vrep_list +from sage.geometry.polyhedron.combinatorial_polyhedron.base cimport CombinatorialPolyhedron +from sage.geometry.polyhedron.combinatorial_polyhedron.face_list_data_structure cimport * combinatorial_face_to_polyhedral_face = LazyImport('sage.geometry.polyhedron.face', 'combinatorial_face_to_polyhedral_face') PolyhedronFace = LazyImport('sage.geometry.polyhedron.face', 'PolyhedronFace') diff --git a/src/sage/geometry/polyhedron/combinatorial_polyhedron/face_list_data_structure.pxd b/src/sage/geometry/polyhedron/combinatorial_polyhedron/face_list_data_structure.pxd index a13df3ff441..a4b411a3ca6 100644 --- a/src/sage/geometry/polyhedron/combinatorial_polyhedron/face_list_data_structure.pxd +++ b/src/sage/geometry/polyhedron/combinatorial_polyhedron/face_list_data_structure.pxd @@ -15,7 +15,7 @@ Inline cython methods for lists of faces. cdef extern from "Python.h": int unlikely(int) nogil # Defined by Cython -from .face_data_structure cimport * +from sage.geometry.polyhedron.combinatorial_polyhedron.face_data_structure cimport * from libc.string cimport memset from cysignals.signals cimport sig_check from cysignals.memory cimport check_allocarray, check_calloc, sig_free diff --git a/src/sage/geometry/polyhedron/combinatorial_polyhedron/list_of_faces.pxd b/src/sage/geometry/polyhedron/combinatorial_polyhedron/list_of_faces.pxd index b510c27052a..28a625ed12a 100644 --- a/src/sage/geometry/polyhedron/combinatorial_polyhedron/list_of_faces.pxd +++ b/src/sage/geometry/polyhedron/combinatorial_polyhedron/list_of_faces.pxd @@ -1,6 +1,6 @@ # sage_setup: distribution = sagemath-polyhedra cimport cython -from .face_list_data_structure cimport face_list_t, face_t +from sage.geometry.polyhedron.combinatorial_polyhedron.face_list_data_structure cimport face_list_t, face_t @cython.final cdef class ListOfFaces: diff --git a/src/sage/geometry/polyhedron/combinatorial_polyhedron/list_of_faces.pyx b/src/sage/geometry/polyhedron/combinatorial_polyhedron/list_of_faces.pyx index 594db8a487b..b058f20de1a 100644 --- a/src/sage/geometry/polyhedron/combinatorial_polyhedron/list_of_faces.pyx +++ b/src/sage/geometry/polyhedron/combinatorial_polyhedron/list_of_faces.pyx @@ -93,7 +93,7 @@ AUTHOR: from sage.matrix.matrix_dense cimport Matrix_dense -from .face_list_data_structure cimport * +from sage.geometry.polyhedron.combinatorial_polyhedron.face_list_data_structure cimport * cdef extern from "Python.h": int unlikely(int) nogil # Defined by Cython diff --git a/src/sage/geometry/polyhedron/combinatorial_polyhedron/polyhedron_face_lattice.pxd b/src/sage/geometry/polyhedron/combinatorial_polyhedron/polyhedron_face_lattice.pxd index 47691fb780a..a2af33a1900 100644 --- a/src/sage/geometry/polyhedron/combinatorial_polyhedron/polyhedron_face_lattice.pxd +++ b/src/sage/geometry/polyhedron/combinatorial_polyhedron/polyhedron_face_lattice.pxd @@ -1,9 +1,9 @@ # sage_setup: distribution = sagemath-polyhedra cimport cython -from .list_of_faces cimport ListOfFaces -from .face_data_structure cimport face_t -from .face_list_data_structure cimport face_list_t -from .combinatorial_face cimport CombinatorialFace +from sage.geometry.polyhedron.combinatorial_polyhedron.list_of_faces cimport ListOfFaces +from sage.geometry.polyhedron.combinatorial_polyhedron.face_data_structure cimport face_t +from sage.geometry.polyhedron.combinatorial_polyhedron.face_list_data_structure cimport face_list_t +from sage.geometry.polyhedron.combinatorial_polyhedron.combinatorial_face cimport CombinatorialFace @cython.final cdef class PolyhedronFaceLattice: diff --git a/src/sage/geometry/polyhedron/combinatorial_polyhedron/polyhedron_face_lattice.pyx b/src/sage/geometry/polyhedron/combinatorial_polyhedron/polyhedron_face_lattice.pyx index cc168539fa2..a37155507ac 100644 --- a/src/sage/geometry/polyhedron/combinatorial_polyhedron/polyhedron_face_lattice.pyx +++ b/src/sage/geometry/polyhedron/combinatorial_polyhedron/polyhedron_face_lattice.pyx @@ -65,11 +65,11 @@ from .conversions \ import facets_tuple_to_bit_rep_of_facets, \ facets_tuple_to_bit_rep_of_Vrep -from .conversions cimport bit_rep_to_Vrep_list +from sage.geometry.polyhedron.combinatorial_polyhedron.conversions cimport bit_rep_to_Vrep_list -from .base cimport CombinatorialPolyhedron -from .face_iterator cimport FaceIterator -from .face_list_data_structure cimport * +from sage.geometry.polyhedron.combinatorial_polyhedron.base cimport CombinatorialPolyhedron +from sage.geometry.polyhedron.combinatorial_polyhedron.face_iterator cimport FaceIterator +from sage.geometry.polyhedron.combinatorial_polyhedron.face_list_data_structure cimport * cdef extern from "Python.h": diff --git a/src/sage/geometry/triangulation/base.pyx b/src/sage/geometry/triangulation/base.pyx index 67af2d8fe58..99f908e2c31 100644 --- a/src/sage/geometry/triangulation/base.pyx +++ b/src/sage/geometry/triangulation/base.pyx @@ -28,8 +28,8 @@ from sage.structure.parent cimport Parent from sage.categories.sets_cat import Sets from sage.matrix.constructor import matrix -from .functions cimport binomial -from .triangulations cimport \ +from sage.geometry.triangulation.functions cimport binomial +from sage.geometry.triangulation.triangulations cimport \ triangulations_ptr, init_triangulations, next_triangulation, delete_triangulations diff --git a/src/sage/graphs/base/c_graph.pxd b/src/sage/graphs/base/c_graph.pxd index 1cd8e89a696..92341c9d989 100644 --- a/src/sage/graphs/base/c_graph.pxd +++ b/src/sage/graphs/base/c_graph.pxd @@ -7,7 +7,7 @@ #************************************************************************** from sage.data_structures.bitset cimport bitset_t -from .graph_backends cimport GenericGraphBackend +from sage.graphs.base.graph_backends cimport GenericGraphBackend from libc.stdint cimport uint32_t cdef class CGraph: diff --git a/src/sage/graphs/base/dense_graph.pxd b/src/sage/graphs/base/dense_graph.pxd index 6348855660e..6fe1fa722e2 100644 --- a/src/sage/graphs/base/dense_graph.pxd +++ b/src/sage/graphs/base/dense_graph.pxd @@ -9,7 +9,7 @@ # http://www.gnu.org/licenses/ #***************************************************************************** -from .c_graph cimport CGraph, CGraphBackend +from sage.graphs.base.c_graph cimport CGraph, CGraphBackend from sage.data_structures.binary_matrix cimport binary_matrix_t cdef class DenseGraph(CGraph): diff --git a/src/sage/graphs/base/graph_backends.pyx b/src/sage/graphs/base/graph_backends.pyx index 6cbb0cafc4e..2c91d7df9b1 100644 --- a/src/sage/graphs/base/graph_backends.pyx +++ b/src/sage/graphs/base/graph_backends.pyx @@ -58,7 +58,7 @@ Classes and methods # (at your option) any later version. # https://www.gnu.org/licenses/ # **************************************************************************** -from .c_graph cimport CGraphBackend +from sage.graphs.base.c_graph cimport CGraphBackend cdef class GenericGraphBackend(SageObject): diff --git a/src/sage/graphs/base/sparse_graph.pxd b/src/sage/graphs/base/sparse_graph.pxd index 974ff3c3804..ef12f326b2c 100644 --- a/src/sage/graphs/base/sparse_graph.pxd +++ b/src/sage/graphs/base/sparse_graph.pxd @@ -9,7 +9,7 @@ # https://www.gnu.org/licenses/ # **************************************************************************** -from .c_graph cimport CGraph, CGraphBackend +from sage.graphs.base.c_graph cimport CGraph, CGraphBackend cimport cython cdef struct SparseGraphLLNode: diff --git a/src/sage/graphs/base/static_sparse_backend.pxd b/src/sage/graphs/base/static_sparse_backend.pxd index 4d716c0b563..acd87e91a26 100644 --- a/src/sage/graphs/base/static_sparse_backend.pxd +++ b/src/sage/graphs/base/static_sparse_backend.pxd @@ -1,6 +1,6 @@ # sage_setup: distribution = sagemath-graphs -from .c_graph cimport CGraph, CGraphBackend -from .static_sparse_graph cimport short_digraph, ushort +from sage.graphs.base.c_graph cimport CGraph, CGraphBackend +from sage.graphs.base.static_sparse_graph cimport short_digraph, ushort from libc.stdint cimport uint64_t, uint32_t, INT32_MAX, UINT32_MAX from sage.data_structures.bitset cimport * diff --git a/src/sage/graphs/base/static_sparse_backend.pyx b/src/sage/graphs/base/static_sparse_backend.pyx index e7dc8a56327..570f815b331 100644 --- a/src/sage/graphs/base/static_sparse_backend.pyx +++ b/src/sage/graphs/base/static_sparse_backend.pyx @@ -44,7 +44,7 @@ from sage.graphs.base.static_sparse_graph cimport (init_short_digraph, has_edge, free_short_digraph, edge_label) -from .c_graph cimport CGraphBackend +from sage.graphs.base.c_graph cimport CGraphBackend from sage.data_structures.bitset cimport FrozenBitset from libc.stdint cimport uint32_t from sage.data_structures.bitset_base cimport * diff --git a/src/sage/graphs/base/static_sparse_graph.pyx b/src/sage/graphs/base/static_sparse_graph.pyx index 13fb79bf858..1fa099727d2 100644 --- a/src/sage/graphs/base/static_sparse_graph.pyx +++ b/src/sage/graphs/base/static_sparse_graph.pyx @@ -192,8 +192,8 @@ from memory_allocator cimport MemoryAllocator from sage.data_structures.bitset_base cimport * from sage.graphs.base.c_graph cimport CGraph -from .static_sparse_backend cimport StaticSparseCGraph -from .static_sparse_backend cimport StaticSparseBackend +from sage.graphs.base.static_sparse_backend cimport StaticSparseCGraph +from sage.graphs.base.static_sparse_backend cimport StaticSparseBackend cdef extern from "fenv.h": diff --git a/src/sage/groups/perm_gps/partn_ref/automorphism_group_canonical_label.pxd b/src/sage/groups/perm_gps/partn_ref/automorphism_group_canonical_label.pxd index 2746019326e..9e259b2d0ba 100644 --- a/src/sage/groups/perm_gps/partn_ref/automorphism_group_canonical_label.pxd +++ b/src/sage/groups/perm_gps/partn_ref/automorphism_group_canonical_label.pxd @@ -9,7 +9,7 @@ # http://www.gnu.org/licenses/ #***************************************************************************** -from .data_structures cimport * +from sage.groups.perm_gps.partn_ref.data_structures cimport * from sage.data_structures.bitset cimport bitset_t from sage.rings.integer cimport Integer diff --git a/src/sage/groups/perm_gps/partn_ref/automorphism_group_canonical_label.pyx b/src/sage/groups/perm_gps/partn_ref/automorphism_group_canonical_label.pyx index 6272a3d62c3..a1305415766 100644 --- a/src/sage/groups/perm_gps/partn_ref/automorphism_group_canonical_label.pyx +++ b/src/sage/groups/perm_gps/partn_ref/automorphism_group_canonical_label.pyx @@ -114,7 +114,7 @@ REFERENCE: from libc.string cimport memcmp, memcpy from cysignals.memory cimport sig_malloc, sig_realloc, sig_free -from .data_structures cimport * +from sage.groups.perm_gps.partn_ref.data_structures cimport * from sage.data_structures.bitset_base cimport * cdef inline int agcl_cmp(int a, int b): diff --git a/src/sage/groups/perm_gps/partn_ref/canonical_augmentation.pxd b/src/sage/groups/perm_gps/partn_ref/canonical_augmentation.pxd index fd92781a93d..33885a11c5f 100644 --- a/src/sage/groups/perm_gps/partn_ref/canonical_augmentation.pxd +++ b/src/sage/groups/perm_gps/partn_ref/canonical_augmentation.pxd @@ -18,13 +18,13 @@ AUTHORS: # http://www.gnu.org/licenses/ #***************************************************************************** -from .data_structures cimport * +from sage.groups.perm_gps.partn_ref.data_structures cimport * -from .automorphism_group_canonical_label cimport ( +from sage.groups.perm_gps.partn_ref.automorphism_group_canonical_label cimport ( get_aut_gp_and_can_lab, aut_gp_and_can_lab, agcl_work_space, allocate_agcl_output, deallocate_agcl_output, allocate_agcl_work_space, deallocate_agcl_work_space) -from .double_coset cimport (double_coset, +from sage.groups.perm_gps.partn_ref.double_coset cimport (double_coset, dc_work_space, allocate_dc_work_space, deallocate_dc_work_space) diff --git a/src/sage/groups/perm_gps/partn_ref/canonical_augmentation.pyx b/src/sage/groups/perm_gps/partn_ref/canonical_augmentation.pyx index 0535ed189dd..1c7d5280f72 100644 --- a/src/sage/groups/perm_gps/partn_ref/canonical_augmentation.pyx +++ b/src/sage/groups/perm_gps/partn_ref/canonical_augmentation.pyx @@ -170,7 +170,7 @@ REFERENCE: from cysignals.memory cimport sig_malloc, sig_free -from .data_structures cimport* +from sage.groups.perm_gps.partn_ref.data_structures cimport* cdef void *canonical_generator_next(void *can_gen_data, int *degree, bint *mem_err): diff --git a/src/sage/groups/perm_gps/partn_ref/double_coset.pxd b/src/sage/groups/perm_gps/partn_ref/double_coset.pxd index 64e852a4730..f1f598d27bf 100644 --- a/src/sage/groups/perm_gps/partn_ref/double_coset.pxd +++ b/src/sage/groups/perm_gps/partn_ref/double_coset.pxd @@ -9,7 +9,7 @@ # http://www.gnu.org/licenses/ #***************************************************************************** -from .data_structures cimport * +from sage.groups.perm_gps.partn_ref.data_structures cimport * from sage.data_structures.bitset cimport bitset_t from sage.rings.integer cimport Integer diff --git a/src/sage/groups/perm_gps/partn_ref/double_coset.pyx b/src/sage/groups/perm_gps/partn_ref/double_coset.pyx index af4daff6080..6f04d9d4f10 100644 --- a/src/sage/groups/perm_gps/partn_ref/double_coset.pyx +++ b/src/sage/groups/perm_gps/partn_ref/double_coset.pyx @@ -97,7 +97,7 @@ REFERENCE: from cysignals.memory cimport sig_calloc -from .data_structures cimport * +from sage.groups.perm_gps.partn_ref.data_structures cimport * from sage.data_structures.bitset_base cimport * # Functions diff --git a/src/sage/groups/perm_gps/partn_ref/refinement_binary.pxd b/src/sage/groups/perm_gps/partn_ref/refinement_binary.pxd index 53b40b4d229..fe714b2792c 100644 --- a/src/sage/groups/perm_gps/partn_ref/refinement_binary.pxd +++ b/src/sage/groups/perm_gps/partn_ref/refinement_binary.pxd @@ -9,9 +9,9 @@ # http://www.gnu.org/licenses/ #***************************************************************************** -from .data_structures cimport * +from sage.groups.perm_gps.partn_ref.data_structures cimport * -from .automorphism_group_canonical_label cimport ( +from sage.groups.perm_gps.partn_ref.automorphism_group_canonical_label cimport ( get_aut_gp_and_can_lab, aut_gp_and_can_lab, agcl_work_space, allocate_agcl_output, deallocate_agcl_output, allocate_agcl_work_space, deallocate_agcl_work_space) diff --git a/src/sage/groups/perm_gps/partn_ref/refinement_binary.pyx b/src/sage/groups/perm_gps/partn_ref/refinement_binary.pyx index a1149c07ad5..13a9088eba2 100644 --- a/src/sage/groups/perm_gps/partn_ref/refinement_binary.pyx +++ b/src/sage/groups/perm_gps/partn_ref/refinement_binary.pyx @@ -29,10 +29,10 @@ REFERENCE: #***************************************************************************** from sage.data_structures.bitset_base cimport * -from .data_structures cimport * +from sage.groups.perm_gps.partn_ref.data_structures cimport * from sage.rings.integer cimport Integer from sage.structure.element import is_Matrix -from .double_coset cimport double_coset +from sage.groups.perm_gps.partn_ref.double_coset cimport double_coset cdef class LinearBinaryCodeStruct(BinaryCodeStruct): diff --git a/src/sage/groups/perm_gps/partn_ref/refinement_graphs.pxd b/src/sage/groups/perm_gps/partn_ref/refinement_graphs.pxd index c710b2cefc9..3dbbb6f8c5a 100644 --- a/src/sage/groups/perm_gps/partn_ref/refinement_graphs.pxd +++ b/src/sage/groups/perm_gps/partn_ref/refinement_graphs.pxd @@ -9,17 +9,17 @@ # http://www.gnu.org/licenses/ #***************************************************************************** -from .data_structures cimport * +from sage.groups.perm_gps.partn_ref.data_structures cimport * from sage.graphs.base.c_graph cimport CGraph -from .automorphism_group_canonical_label cimport ( +from sage.groups.perm_gps.partn_ref.automorphism_group_canonical_label cimport ( get_aut_gp_and_can_lab, aut_gp_and_can_lab, agcl_work_space, allocate_agcl_output, deallocate_agcl_output, allocate_agcl_work_space, deallocate_agcl_work_space) -from .canonical_augmentation cimport (iterator, +from sage.groups.perm_gps.partn_ref.canonical_augmentation cimport (iterator, canonical_generator_data, allocate_cgd, deallocate_cgd, canonical_generator_next, setup_canonical_generator, start_canonical_generator) -from .refinement_sets cimport (subset, free_subset, all_set_children_are_equivalent, +from sage.groups.perm_gps.partn_ref.refinement_sets cimport (subset, free_subset, all_set_children_are_equivalent, refine_set, compare_sets, generate_child_subsets, apply_subset_aug, canonical_set_parent, allocate_sgd, deallocate_sgd, allocate_subset_gen, free_subset_gen, setup_set_gen, subset_generator_next, subset_generator_data, allocate_subset_gen_2) diff --git a/src/sage/groups/perm_gps/partn_ref/refinement_graphs.pyx b/src/sage/groups/perm_gps/partn_ref/refinement_graphs.pyx index 977e4a28639..f658be4e3f0 100644 --- a/src/sage/groups/perm_gps/partn_ref/refinement_graphs.pyx +++ b/src/sage/groups/perm_gps/partn_ref/refinement_graphs.pyx @@ -21,12 +21,12 @@ REFERENCE: # https://www.gnu.org/licenses/ # **************************************************************************** -from .data_structures cimport * +from sage.groups.perm_gps.partn_ref.data_structures cimport * from sage.data_structures.bitset_base cimport * from sage.rings.integer cimport Integer from sage.graphs.base.sparse_graph cimport SparseGraph from sage.graphs.base.dense_graph cimport DenseGraph, copy_dense_graph -from .double_coset cimport double_coset +from sage.groups.perm_gps.partn_ref.double_coset cimport double_coset def isomorphic(G1, G2, partn, ordering2, dig, use_indicator_function, sparse=False): diff --git a/src/sage/groups/perm_gps/partn_ref/refinement_lists.pxd b/src/sage/groups/perm_gps/partn_ref/refinement_lists.pxd index a79b2c1fd98..5be077b0739 100644 --- a/src/sage/groups/perm_gps/partn_ref/refinement_lists.pxd +++ b/src/sage/groups/perm_gps/partn_ref/refinement_lists.pxd @@ -10,7 +10,7 @@ # http://www.gnu.org/licenses/ #***************************************************************************** -from .data_structures cimport * +from sage.groups.perm_gps.partn_ref.data_structures cimport * # name of the three functions to customize diff --git a/src/sage/groups/perm_gps/partn_ref/refinement_lists.pyx b/src/sage/groups/perm_gps/partn_ref/refinement_lists.pyx index e183ef2763b..4d8b62f337c 100644 --- a/src/sage/groups/perm_gps/partn_ref/refinement_lists.pyx +++ b/src/sage/groups/perm_gps/partn_ref/refinement_lists.pyx @@ -21,8 +21,8 @@ EXAMPLES:: from cysignals.memory cimport sig_malloc, sig_free -from .data_structures cimport * -from .double_coset cimport double_coset, int_cmp +from sage.groups.perm_gps.partn_ref.data_structures cimport * +from sage.groups.perm_gps.partn_ref.double_coset cimport double_coset, int_cmp def is_isomorphic(self, other): diff --git a/src/sage/groups/perm_gps/partn_ref/refinement_matrices.pxd b/src/sage/groups/perm_gps/partn_ref/refinement_matrices.pxd index 1bc9b37c63d..69bab3eaeb5 100644 --- a/src/sage/groups/perm_gps/partn_ref/refinement_matrices.pxd +++ b/src/sage/groups/perm_gps/partn_ref/refinement_matrices.pxd @@ -9,9 +9,9 @@ # http://www.gnu.org/licenses/ #***************************************************************************** -from .data_structures cimport * +from sage.groups.perm_gps.partn_ref.data_structures cimport * -from .automorphism_group_canonical_label cimport ( +from sage.groups.perm_gps.partn_ref.automorphism_group_canonical_label cimport ( get_aut_gp_and_can_lab, aut_gp_and_can_lab, agcl_work_space, allocate_agcl_output, deallocate_agcl_output, allocate_agcl_work_space, deallocate_agcl_work_space) diff --git a/src/sage/groups/perm_gps/partn_ref/refinement_matrices.pyx b/src/sage/groups/perm_gps/partn_ref/refinement_matrices.pyx index 4c1a15b2c62..87ec60e0c94 100644 --- a/src/sage/groups/perm_gps/partn_ref/refinement_matrices.pyx +++ b/src/sage/groups/perm_gps/partn_ref/refinement_matrices.pyx @@ -29,12 +29,12 @@ REFERENCE: from libc.string cimport memcmp -from .data_structures cimport * +from sage.groups.perm_gps.partn_ref.data_structures cimport * from sage.data_structures.bitset_base cimport * from sage.rings.integer cimport Integer from sage.matrix.constructor import Matrix -from .refinement_binary cimport NonlinearBinaryCodeStruct, refine_by_bip_degree -from .double_coset cimport double_coset +from sage.groups.perm_gps.partn_ref.refinement_binary cimport NonlinearBinaryCodeStruct, refine_by_bip_degree +from sage.groups.perm_gps.partn_ref.double_coset cimport double_coset cdef class MatrixStruct: diff --git a/src/sage/groups/perm_gps/partn_ref/refinement_python.pxd b/src/sage/groups/perm_gps/partn_ref/refinement_python.pxd index ecce554d000..96e68132042 100644 --- a/src/sage/groups/perm_gps/partn_ref/refinement_python.pxd +++ b/src/sage/groups/perm_gps/partn_ref/refinement_python.pxd @@ -9,7 +9,7 @@ # http://www.gnu.org/licenses/ #***************************************************************************** -from .data_structures cimport * +from sage.groups.perm_gps.partn_ref.data_structures cimport * cdef class PythonPartitionStack: diff --git a/src/sage/groups/perm_gps/partn_ref/refinement_python.pyx b/src/sage/groups/perm_gps/partn_ref/refinement_python.pyx index 78fe198d6fe..cb6f984485d 100644 --- a/src/sage/groups/perm_gps/partn_ref/refinement_python.pyx +++ b/src/sage/groups/perm_gps/partn_ref/refinement_python.pyx @@ -33,11 +33,11 @@ debugger. from cysignals.memory cimport sig_malloc, sig_free -from .data_structures cimport * -from .automorphism_group_canonical_label cimport ( +from sage.groups.perm_gps.partn_ref.data_structures cimport * +from sage.groups.perm_gps.partn_ref.automorphism_group_canonical_label cimport ( get_aut_gp_and_can_lab, aut_gp_and_can_lab, deallocate_agcl_output) -from .double_coset cimport double_coset +from sage.groups.perm_gps.partn_ref.double_coset cimport double_coset from sage.rings.integer cimport Integer diff --git a/src/sage/groups/perm_gps/partn_ref/refinement_sets.pxd b/src/sage/groups/perm_gps/partn_ref/refinement_sets.pxd index 7243cb410eb..aa6c772abb2 100644 --- a/src/sage/groups/perm_gps/partn_ref/refinement_sets.pxd +++ b/src/sage/groups/perm_gps/partn_ref/refinement_sets.pxd @@ -18,12 +18,12 @@ AUTHORS: # http://www.gnu.org/licenses/ #***************************************************************************** -from .data_structures cimport * -from .automorphism_group_canonical_label cimport ( +from sage.groups.perm_gps.partn_ref.data_structures cimport * +from sage.groups.perm_gps.partn_ref.automorphism_group_canonical_label cimport ( get_aut_gp_and_can_lab, aut_gp_and_can_lab, agcl_work_space, allocate_agcl_output, deallocate_agcl_output, allocate_agcl_work_space, deallocate_agcl_work_space) -from .canonical_augmentation cimport (iterator, +from sage.groups.perm_gps.partn_ref.canonical_augmentation cimport (iterator, canonical_generator_data, allocate_cgd, deallocate_cgd, canonical_generator_next, setup_canonical_generator, start_canonical_generator) diff --git a/src/sage/groups/perm_gps/partn_ref/refinement_sets.pyx b/src/sage/groups/perm_gps/partn_ref/refinement_sets.pyx index 1f8084f2d93..e9eb4a6244e 100644 --- a/src/sage/groups/perm_gps/partn_ref/refinement_sets.pyx +++ b/src/sage/groups/perm_gps/partn_ref/refinement_sets.pyx @@ -27,8 +27,8 @@ REFERENCE: # http://www.gnu.org/licenses/ #***************************************************************************** -from .data_structures cimport * -from .double_coset cimport double_coset +from sage.groups.perm_gps.partn_ref.data_structures cimport * +from sage.groups.perm_gps.partn_ref.double_coset cimport double_coset from sage.data_structures.bitset_base cimport * diff --git a/src/sage/libs/arb/arith.pyx b/src/sage/libs/arb/arith.pyx index f0b4a9a6436..79cd0d36dbc 100644 --- a/src/sage/libs/arb/arith.pyx +++ b/src/sage/libs/arb/arith.pyx @@ -13,10 +13,10 @@ Arithmetic functions using the arb library # http://www.gnu.org/licenses/ #***************************************************************************** -from ..flint.types cimport ulong -from ..flint.fmpq cimport fmpq_t, fmpq_init, fmpq_clear, fmpq_get_mpq -from .bernoulli cimport bernoulli_fmpq_ui -from .acb_modular cimport acb_modular_hilbert_class_poly +from sage.libs.flint.types cimport ulong +from sage.libs.flint.fmpq cimport fmpq_t, fmpq_init, fmpq_clear, fmpq_get_mpq +from sage.libs.arb.bernoulli cimport bernoulli_fmpq_ui +from sage.libs.arb.acb_modular cimport acb_modular_hilbert_class_poly from sage.rings.rational cimport Rational from sage.rings.polynomial.polynomial_integer_dense_flint cimport Polynomial_integer_dense_flint from sage.rings.polynomial.polynomial_ring_constructor import PolynomialRing diff --git a/src/sage/libs/arb/bernoulli.pxd b/src/sage/libs/arb/bernoulli.pxd index ee46d626fcc..a124ed077c7 100644 --- a/src/sage/libs/arb/bernoulli.pxd +++ b/src/sage/libs/arb/bernoulli.pxd @@ -2,7 +2,7 @@ # distutils: libraries = gmp flint ARB_LIBRARY # distutils: depends = bernoulli.h -from ..flint.types cimport fmpq_t, ulong +from sage.libs.flint.types cimport fmpq_t, ulong # bernoulli.h cdef extern from "arb_wrap.h": diff --git a/src/sage/libs/coxeter3/coxeter.pxd b/src/sage/libs/coxeter3/coxeter.pxd index dbd2b8a61c6..7890da6418b 100644 --- a/src/sage/libs/coxeter3/coxeter.pxd +++ b/src/sage/libs/coxeter3/coxeter.pxd @@ -8,7 +8,7 @@ #***************************************************************************** from sage.structure.sage_object cimport SageObject -from .decl cimport * +from sage.libs.coxeter3.decl cimport * cdef class String: cdef c_String x diff --git a/src/sage/libs/coxeter3/coxeter.pyx b/src/sage/libs/coxeter3/coxeter.pyx index 1cfaacc9b2a..c44dcf7a666 100644 --- a/src/sage/libs/coxeter3/coxeter.pyx +++ b/src/sage/libs/coxeter3/coxeter.pyx @@ -17,7 +17,7 @@ Low level part of the interface to Fokko Ducloux's Coxeter 3 library # https://www.gnu.org/licenses/ # **************************************************************************** -from .decl cimport * +from sage.libs.coxeter3.decl cimport * from cpython.object cimport Py_LT, Py_LE, Py_EQ, Py_NE, Py_GT, Py_GE from sage.cpython.string cimport str_to_bytes, bytes_to_str diff --git a/src/sage/libs/eclib/homspace.pxd b/src/sage/libs/eclib/homspace.pxd index bf315f40ca9..d3600547f1e 100644 --- a/src/sage/libs/eclib/homspace.pxd +++ b/src/sage/libs/eclib/homspace.pxd @@ -1,4 +1,4 @@ -from ..eclib cimport homspace +from sage.libs.eclib cimport homspace cdef class ModularSymbols: cdef homspace* H diff --git a/src/sage/libs/eclib/homspace.pyx b/src/sage/libs/eclib/homspace.pyx index dc52b144328..735de8787e2 100644 --- a/src/sage/libs/eclib/homspace.pyx +++ b/src/sage/libs/eclib/homspace.pyx @@ -4,8 +4,8 @@ from cysignals.signals cimport sig_on, sig_off from cython.operator cimport dereference as deref from cython.operator cimport preincrement as inc -from ..eclib cimport svec, mat, smat -from .mat cimport MatrixFactory +from sage.libs.eclib cimport svec, mat, smat +from sage.libs.eclib.mat cimport MatrixFactory from sage.matrix.matrix_space import MatrixSpace from sage.rings.integer_ring import ZZ diff --git a/src/sage/libs/eclib/mat.pxd b/src/sage/libs/eclib/mat.pxd index 41b0cc628c1..509bd4d0ce8 100644 --- a/src/sage/libs/eclib/mat.pxd +++ b/src/sage/libs/eclib/mat.pxd @@ -1,11 +1,7 @@ -from ..eclib cimport mat +from sage.libs.eclib cimport mat cdef class Matrix: cdef mat* M cdef class MatrixFactory: cdef new_matrix(self, mat M) - - - - diff --git a/src/sage/libs/eclib/mat.pyx b/src/sage/libs/eclib/mat.pyx index 39dee4afc94..b4b607ef083 100644 --- a/src/sage/libs/eclib/mat.pyx +++ b/src/sage/libs/eclib/mat.pyx @@ -2,7 +2,7 @@ Cremona matrices """ -from ..eclib cimport scalar, addscalar +from sage.libs.eclib cimport scalar, addscalar from sage.matrix.matrix_space import MatrixSpace from sage.rings.integer_ring import ZZ diff --git a/src/sage/libs/eclib/newforms.pxd b/src/sage/libs/eclib/newforms.pxd index 9cd1b23a034..7f78a4f9f63 100644 --- a/src/sage/libs/eclib/newforms.pxd +++ b/src/sage/libs/eclib/newforms.pxd @@ -1,4 +1,4 @@ -from ..eclib cimport newforms +from sage.libs.eclib cimport newforms cdef class ECModularSymbol: cdef newforms* nfs diff --git a/src/sage/libs/eclib/newforms.pyx b/src/sage/libs/eclib/newforms.pyx index 2d35716c4db..210c1d9e2c0 100644 --- a/src/sage/libs/eclib/newforms.pyx +++ b/src/sage/libs/eclib/newforms.pyx @@ -13,7 +13,7 @@ Modular symbols using eclib newforms from cysignals.signals cimport sig_on, sig_off -from ..eclib cimport * +from sage.libs.eclib cimport * from sage.libs.gmp.mpq cimport mpq_numref from sage.libs.ntl.convert cimport mpz_to_ZZ from sage.rings.rational_field import QQ diff --git a/src/sage/libs/flint/arith.pyx b/src/sage/libs/flint/arith.pyx index 541a3c1c67e..61f42145931 100644 --- a/src/sage/libs/flint/arith.pyx +++ b/src/sage/libs/flint/arith.pyx @@ -16,8 +16,8 @@ FLINT Arithmetic Functions from cysignals.signals cimport sig_on, sig_off -from .fmpz cimport * -from .fmpq cimport * +from sage.libs.flint.fmpz cimport * +from sage.libs.flint.fmpq cimport * from sage.rings.integer cimport Integer diff --git a/src/sage/libs/flint/ntl_interface.pxd b/src/sage/libs/flint/ntl_interface.pxd index dc27e44d9fd..cf25aa73004 100644 --- a/src/sage/libs/flint/ntl_interface.pxd +++ b/src/sage/libs/flint/ntl_interface.pxd @@ -3,7 +3,7 @@ # distutils: libraries = flint # distutils: depends = flint/NTL-interface.h -from .types cimport fmpz_t, fmpz_poly_t +from sage.libs.flint.types cimport fmpz_t, fmpz_poly_t from sage.libs.ntl.ZZ cimport ZZ_c from sage.libs.ntl.ZZX cimport ZZX_c diff --git a/src/sage/libs/gap/element.pxd b/src/sage/libs/gap/element.pxd index de8d94013be..62135b0ea72 100644 --- a/src/sage/libs/gap/element.pxd +++ b/src/sage/libs/gap/element.pxd @@ -9,7 +9,7 @@ # http://www.gnu.org/licenses/ #***************************************************************************** -from .gap_includes cimport Obj, UInt +from sage.libs.gap.gap_includes cimport Obj, UInt from sage.structure.sage_object cimport SageObject from sage.structure.element cimport Element, ModuleElement, RingElement diff --git a/src/sage/libs/gap/element.pyx b/src/sage/libs/gap/element.pyx index 7361e72bb09..e37c92867a5 100644 --- a/src/sage/libs/gap/element.pyx +++ b/src/sage/libs/gap/element.pyx @@ -19,9 +19,9 @@ elements. For general information about GAP, you should read the from cpython.object cimport Py_EQ, Py_NE, Py_LE, Py_GE, Py_LT, Py_GT from cysignals.signals cimport sig_on, sig_off -from .gap_includes cimport * +from sage.libs.gap.gap_includes cimport * from .libgap import libgap -from .util cimport * +from sage.libs.gap.util cimport * from .util import GAPError from sage.cpython.string cimport str_to_bytes, char_to_str from sage.rings.integer_ring import ZZ diff --git a/src/sage/libs/gap/libgap.pyx b/src/sage/libs/gap/libgap.pyx index 5a126ee8530..8a7c580bad7 100644 --- a/src/sage/libs/gap/libgap.pyx +++ b/src/sage/libs/gap/libgap.pyx @@ -214,9 +214,9 @@ AUTHORS: from pathlib import Path -from .gap_includes cimport * -from .util cimport * -from .element cimport * +from sage.libs.gap.gap_includes cimport * +from sage.libs.gap.util cimport * +from sage.libs.gap.element cimport * from sage.cpython.string cimport str_to_bytes from sage.structure.parent cimport Parent diff --git a/src/sage/libs/gap/util.pxd b/src/sage/libs/gap/util.pxd index 2cbf1032d6c..a04d9a2a5d3 100644 --- a/src/sage/libs/gap/util.pxd +++ b/src/sage/libs/gap/util.pxd @@ -9,7 +9,7 @@ # http://www.gnu.org/licenses/ #***************************************************************************** -from .gap_includes cimport Obj +from sage.libs.gap.gap_includes cimport Obj ############################################################################ ### Hooking into the GAP memory management ################################# diff --git a/src/sage/libs/gap/util.pyx b/src/sage/libs/gap/util.pyx index e905e2ed98c..1cd182f4f06 100644 --- a/src/sage/libs/gap/util.pyx +++ b/src/sage/libs/gap/util.pyx @@ -25,8 +25,8 @@ import os import warnings import sage.env -from .gap_includes cimport * -from .element cimport * +from sage.libs.gap.gap_includes cimport * +from sage.libs.gap.element cimport * from sage.cpython.string import FS_ENCODING from sage.cpython.string cimport str_to_bytes, char_to_str from sage.interfaces.gap_workspace import prepare_workspace_dir diff --git a/src/sage/libs/glpk/error.pyx b/src/sage/libs/glpk/error.pyx index c9b45cce7aa..422bf8f33f5 100644 --- a/src/sage/libs/glpk/error.pyx +++ b/src/sage/libs/glpk/error.pyx @@ -15,7 +15,7 @@ Error handler for the GLPK library from cysignals.signals cimport sig_error -from .env cimport * +from sage.libs.glpk.env cimport * from cpython.exc cimport PyErr_SetObject from sage.cpython.string cimport char_to_str from sage.numerical.mip import MIPSolverException diff --git a/src/sage/libs/gmp/all.pxd b/src/sage/libs/gmp/all.pxd index 8aaa7ff969e..ee59521494e 100644 --- a/src/sage/libs/gmp/all.pxd +++ b/src/sage/libs/gmp/all.pxd @@ -1,6 +1,6 @@ # sage_setup: distribution = sagemath-objects -from .types cimport * -from .random cimport * -from .mpz cimport * -from .mpq cimport * -from .pylong cimport * +from sage.libs.gmp.types cimport * +from sage.libs.gmp.random cimport * +from sage.libs.gmp.mpz cimport * +from sage.libs.gmp.mpq cimport * +from sage.libs.gmp.pylong cimport * diff --git a/src/sage/libs/gmp/binop.pxd b/src/sage/libs/gmp/binop.pxd index e23b9b1f0d9..aed6ca23f50 100644 --- a/src/sage/libs/gmp/binop.pxd +++ b/src/sage/libs/gmp/binop.pxd @@ -3,9 +3,9 @@ r""" Fast binary operations for basic types """ -from .types cimport mpz_t, mpq_t -from .mpz cimport mpz_set, mpz_add, mpz_mul -from .mpq cimport mpq_canonicalize, mpq_numref, mpq_denref, mpq_add +from sage.libs.gmp.types cimport mpz_t, mpq_t +from sage.libs.gmp.mpz cimport mpz_set, mpz_add, mpz_mul +from sage.libs.gmp.mpq cimport mpq_canonicalize, mpq_numref, mpq_denref, mpq_add cdef inline void mpq_add_z(mpq_t res, mpq_t op1, mpz_t op2): mpz_mul(mpq_numref(res), mpq_denref(op1), op2) diff --git a/src/sage/libs/gmp/mpf.pxd b/src/sage/libs/gmp/mpf.pxd index f49e652db2e..a1bbfd46df3 100644 --- a/src/sage/libs/gmp/mpf.pxd +++ b/src/sage/libs/gmp/mpf.pxd @@ -1,7 +1,7 @@ # sage_setup: distribution = sagemath-objects # distutils: libraries = gmp -from .types cimport * +from sage.libs.gmp.types cimport * cdef extern from "gmp.h": diff --git a/src/sage/libs/gmp/mpn.pxd b/src/sage/libs/gmp/mpn.pxd index 4d66636c347..34b045e1f4b 100644 --- a/src/sage/libs/gmp/mpn.pxd +++ b/src/sage/libs/gmp/mpn.pxd @@ -1,7 +1,7 @@ # sage_setup: distribution = sagemath-objects # distutils: libraries = gmp -from .types cimport * +from sage.libs.gmp.types cimport * cdef extern from "gmp.h": diff --git a/src/sage/libs/gmp/mpq.pxd b/src/sage/libs/gmp/mpq.pxd index 4ff4b70e32a..068988ffbc4 100644 --- a/src/sage/libs/gmp/mpq.pxd +++ b/src/sage/libs/gmp/mpq.pxd @@ -1,7 +1,7 @@ # sage_setup: distribution = sagemath-objects # distutils: libraries = gmp -from .types cimport * +from sage.libs.gmp.types cimport * cdef extern from "gmp.h": diff --git a/src/sage/libs/gmp/mpz.pxd b/src/sage/libs/gmp/mpz.pxd index 489c822fc4f..66c44773d17 100644 --- a/src/sage/libs/gmp/mpz.pxd +++ b/src/sage/libs/gmp/mpz.pxd @@ -1,7 +1,7 @@ # sage_setup: distribution = sagemath-objects # distutils: libraries = gmp -from .types cimport * +from sage.libs.gmp.types cimport * from libc.stdio cimport FILE from libc.stdint cimport intmax_t, uintmax_t diff --git a/src/sage/libs/gmp/pylong.pyx b/src/sage/libs/gmp/pylong.pyx index e00bdad3e94..e69ff308e8f 100644 --- a/src/sage/libs/gmp/pylong.pyx +++ b/src/sage/libs/gmp/pylong.pyx @@ -30,7 +30,7 @@ from cpython.object cimport Py_SIZE from cpython.int cimport PyInt_FromLong from cpython.long cimport PyLong_FromLong from cpython.longintrepr cimport _PyLong_New, py_long, digit, PyLong_SHIFT -from .mpz cimport * +from sage.libs.gmp.mpz cimport * cdef extern from *: """ diff --git a/src/sage/libs/gmp/random.pxd b/src/sage/libs/gmp/random.pxd index 69c75c76da6..ef3cde3c4ea 100644 --- a/src/sage/libs/gmp/random.pxd +++ b/src/sage/libs/gmp/random.pxd @@ -1,7 +1,7 @@ # sage_setup: distribution = sagemath-objects # distutils: libraries = gmp -from .types cimport * +from sage.libs.gmp.types cimport * cdef extern from "gmp.h": diff --git a/src/sage/libs/gsl/airy.pxd b/src/sage/libs/gsl/airy.pxd index e731c8c3ece..d4f8c8806ee 100644 --- a/src/sage/libs/gsl/airy.pxd +++ b/src/sage/libs/gsl/airy.pxd @@ -2,7 +2,7 @@ # distutils: libraries = GSL_LIBRARIES # distutils: library_dirs = GSL_LIBDIR # distutils: include_dirs = GSL_INCDIR -from .types cimport * +from sage.libs.gsl.types cimport * cdef extern from "gsl/gsl_sf_airy.h": diff --git a/src/sage/libs/gsl/all.pxd b/src/sage/libs/gsl/all.pxd index dd879de4d68..5d90292969a 100644 --- a/src/sage/libs/gsl/all.pxd +++ b/src/sage/libs/gsl/all.pxd @@ -1,66 +1,66 @@ # sage_setup: distribution = sagemath-modules -from .types cimport * +from sage.libs.gsl.types cimport * -from .math cimport * -from .complex cimport * -from .poly cimport * -from .airy cimport * -from .bessel cimport * -from .clausen cimport * -from .coulomb cimport * -from .coupling cimport * -from .dawson cimport * -from .debye cimport * -from .dilog cimport * -from .elementary cimport * -from .ellint cimport * -from .elljac cimport * -from .erf cimport * -from .exp cimport * -from .expint cimport * -from .fermi_dirac cimport * -from .gamma cimport * -from .gegenbauer cimport * -from .hyperg cimport * -from .laguerre cimport * -from .lambert cimport * -from .legendre cimport * -from .log cimport * -from .pow_int cimport * -from .psi cimport * -from .synchrotron cimport * -from .transport cimport * -from .trig cimport * -from .wavelet cimport * -from .zeta cimport * +from sage.libs.gsl.math cimport * +from sage.libs.gsl.complex cimport * +from sage.libs.gsl.poly cimport * +from sage.libs.gsl.airy cimport * +from sage.libs.gsl.bessel cimport * +from sage.libs.gsl.clausen cimport * +from sage.libs.gsl.coulomb cimport * +from sage.libs.gsl.coupling cimport * +from sage.libs.gsl.dawson cimport * +from sage.libs.gsl.debye cimport * +from sage.libs.gsl.dilog cimport * +from sage.libs.gsl.elementary cimport * +from sage.libs.gsl.ellint cimport * +from sage.libs.gsl.elljac cimport * +from sage.libs.gsl.erf cimport * +from sage.libs.gsl.exp cimport * +from sage.libs.gsl.expint cimport * +from sage.libs.gsl.fermi_dirac cimport * +from sage.libs.gsl.gamma cimport * +from sage.libs.gsl.gegenbauer cimport * +from sage.libs.gsl.hyperg cimport * +from sage.libs.gsl.laguerre cimport * +from sage.libs.gsl.lambert cimport * +from sage.libs.gsl.legendre cimport * +from sage.libs.gsl.log cimport * +from sage.libs.gsl.pow_int cimport * +from sage.libs.gsl.psi cimport * +from sage.libs.gsl.synchrotron cimport * +from sage.libs.gsl.transport cimport * +from sage.libs.gsl.trig cimport * +from sage.libs.gsl.wavelet cimport * +from sage.libs.gsl.zeta cimport * -from .block cimport * -from .vector cimport * -from .vector_complex cimport * -from .matrix cimport * -from .matrix_complex cimport * +from sage.libs.gsl.block cimport * +from sage.libs.gsl.vector cimport * +from sage.libs.gsl.vector_complex cimport * +from sage.libs.gsl.matrix cimport * +from sage.libs.gsl.matrix_complex cimport * -from .permutation cimport * -from .combination cimport * -from .sort cimport * +from sage.libs.gsl.permutation cimport * +from sage.libs.gsl.combination cimport * +from sage.libs.gsl.sort cimport * -from .blas cimport * -from .linalg cimport * -from .eigen cimport * -from .fft cimport * -from .integration cimport * -from .rng cimport * -from .qrng cimport * -from .random cimport * -from .statistics cimport * -from .histogram cimport * -from .ntuple cimport * -from .monte cimport * -from .odeiv cimport * -from .interp cimport * -from .chebyshev cimport * -from .sum cimport * -from .roots cimport * -from .min cimport * -from .fit cimport * -from .errno cimport * +from sage.libs.gsl.blas cimport * +from sage.libs.gsl.linalg cimport * +from sage.libs.gsl.eigen cimport * +from sage.libs.gsl.fft cimport * +from sage.libs.gsl.integration cimport * +from sage.libs.gsl.rng cimport * +from sage.libs.gsl.qrng cimport * +from sage.libs.gsl.random cimport * +from sage.libs.gsl.statistics cimport * +from sage.libs.gsl.histogram cimport * +from sage.libs.gsl.ntuple cimport * +from sage.libs.gsl.monte cimport * +from sage.libs.gsl.odeiv cimport * +from sage.libs.gsl.interp cimport * +from sage.libs.gsl.chebyshev cimport * +from sage.libs.gsl.sum cimport * +from sage.libs.gsl.roots cimport * +from sage.libs.gsl.min cimport * +from sage.libs.gsl.fit cimport * +from sage.libs.gsl.errno cimport * diff --git a/src/sage/libs/gsl/bessel.pxd b/src/sage/libs/gsl/bessel.pxd index 8be7c928c2a..64f06a36db9 100644 --- a/src/sage/libs/gsl/bessel.pxd +++ b/src/sage/libs/gsl/bessel.pxd @@ -2,7 +2,7 @@ # distutils: libraries = GSL_LIBRARIES # distutils: library_dirs = GSL_LIBDIR # distutils: include_dirs = GSL_INCDIR -from .types cimport * +from sage.libs.gsl.types cimport * cdef extern from "gsl/gsl_sf_bessel.h": diff --git a/src/sage/libs/gsl/blas.pxd b/src/sage/libs/gsl/blas.pxd index 6a520ff8d17..0648ecf42a2 100644 --- a/src/sage/libs/gsl/blas.pxd +++ b/src/sage/libs/gsl/blas.pxd @@ -2,7 +2,7 @@ # distutils: libraries = GSL_LIBRARIES # distutils: library_dirs = GSL_LIBDIR # distutils: include_dirs = GSL_INCDIR -from .types cimport * +from sage.libs.gsl.types cimport * cdef extern from "gsl/gsl_blas.h": diff --git a/src/sage/libs/gsl/block.pxd b/src/sage/libs/gsl/block.pxd index 1ea502c8baf..f0ddd7ecb52 100644 --- a/src/sage/libs/gsl/block.pxd +++ b/src/sage/libs/gsl/block.pxd @@ -2,7 +2,7 @@ # distutils: libraries = GSL_LIBRARIES # distutils: library_dirs = GSL_LIBDIR # distutils: include_dirs = GSL_INCDIR -from .types cimport * +from sage.libs.gsl.types cimport * cdef extern from "gsl/gsl_block_double.h": diff --git a/src/sage/libs/gsl/chebyshev.pxd b/src/sage/libs/gsl/chebyshev.pxd index c6c2d281059..87158ebd611 100644 --- a/src/sage/libs/gsl/chebyshev.pxd +++ b/src/sage/libs/gsl/chebyshev.pxd @@ -2,7 +2,7 @@ # distutils: libraries = GSL_LIBRARIES # distutils: library_dirs = GSL_LIBDIR # distutils: include_dirs = GSL_INCDIR -from .types cimport * +from sage.libs.gsl.types cimport * cdef extern from "gsl/gsl_chebyshev.h": diff --git a/src/sage/libs/gsl/clausen.pxd b/src/sage/libs/gsl/clausen.pxd index 49b149aeac6..f45676f2673 100644 --- a/src/sage/libs/gsl/clausen.pxd +++ b/src/sage/libs/gsl/clausen.pxd @@ -2,7 +2,7 @@ # distutils: libraries = GSL_LIBRARIES # distutils: library_dirs = GSL_LIBDIR # distutils: include_dirs = GSL_INCDIR -from .types cimport * +from sage.libs.gsl.types cimport * cdef extern from "gsl/gsl_sf_clausen.h": diff --git a/src/sage/libs/gsl/combination.pxd b/src/sage/libs/gsl/combination.pxd index d7786c9bd56..8e382d71d97 100644 --- a/src/sage/libs/gsl/combination.pxd +++ b/src/sage/libs/gsl/combination.pxd @@ -2,7 +2,7 @@ # distutils: libraries = GSL_LIBRARIES # distutils: library_dirs = GSL_LIBDIR # distutils: include_dirs = GSL_INCDIR -from .types cimport * +from sage.libs.gsl.types cimport * cdef extern from "gsl/gsl_combination.h": diff --git a/src/sage/libs/gsl/complex.pxd b/src/sage/libs/gsl/complex.pxd index 49728c7936f..98db853b947 100644 --- a/src/sage/libs/gsl/complex.pxd +++ b/src/sage/libs/gsl/complex.pxd @@ -2,7 +2,7 @@ # distutils: libraries = GSL_LIBRARIES # distutils: library_dirs = GSL_LIBDIR # distutils: include_dirs = GSL_INCDIR -from .types cimport * +from sage.libs.gsl.types cimport * cdef extern from "gsl/gsl_complex.h": double GSL_REAL(gsl_complex z) diff --git a/src/sage/libs/gsl/coulomb.pxd b/src/sage/libs/gsl/coulomb.pxd index 0def5a2c7aa..7b6d8be0640 100644 --- a/src/sage/libs/gsl/coulomb.pxd +++ b/src/sage/libs/gsl/coulomb.pxd @@ -2,7 +2,7 @@ # distutils: libraries = GSL_LIBRARIES # distutils: library_dirs = GSL_LIBDIR # distutils: include_dirs = GSL_INCDIR -from .types cimport * +from sage.libs.gsl.types cimport * cdef extern from "gsl/gsl_sf_coulomb.h": diff --git a/src/sage/libs/gsl/coupling.pxd b/src/sage/libs/gsl/coupling.pxd index 6e7d9086d16..29a3fc89ce9 100644 --- a/src/sage/libs/gsl/coupling.pxd +++ b/src/sage/libs/gsl/coupling.pxd @@ -3,7 +3,7 @@ # distutils: library_dirs = GSL_LIBDIR # distutils: include_dirs = GSL_INCDIR # distutils: extra_compile_args = -DGSL_DISABLE_DEPRECATED -from .types cimport * +from sage.libs.gsl.types cimport * cdef extern from "gsl/gsl_sf_coupling.h": diff --git a/src/sage/libs/gsl/dawson.pxd b/src/sage/libs/gsl/dawson.pxd index 4e72ed6ae73..553527d588a 100644 --- a/src/sage/libs/gsl/dawson.pxd +++ b/src/sage/libs/gsl/dawson.pxd @@ -2,7 +2,7 @@ # distutils: libraries = GSL_LIBRARIES # distutils: library_dirs = GSL_LIBDIR # distutils: include_dirs = GSL_INCDIR -from .types cimport * +from sage.libs.gsl.types cimport * cdef extern from "gsl/gsl_sf_dawson.h": diff --git a/src/sage/libs/gsl/debye.pxd b/src/sage/libs/gsl/debye.pxd index c3691035457..07273be89a6 100644 --- a/src/sage/libs/gsl/debye.pxd +++ b/src/sage/libs/gsl/debye.pxd @@ -2,7 +2,7 @@ # distutils: libraries = GSL_LIBRARIES # distutils: library_dirs = GSL_LIBDIR # distutils: include_dirs = GSL_INCDIR -from .types cimport * +from sage.libs.gsl.types cimport * cdef extern from "gsl/gsl_sf_debye.h": diff --git a/src/sage/libs/gsl/dilog.pxd b/src/sage/libs/gsl/dilog.pxd index be03e83b701..3af4655c653 100644 --- a/src/sage/libs/gsl/dilog.pxd +++ b/src/sage/libs/gsl/dilog.pxd @@ -2,7 +2,7 @@ # distutils: libraries = GSL_LIBRARIES # distutils: library_dirs = GSL_LIBDIR # distutils: include_dirs = GSL_INCDIR -from .types cimport * +from sage.libs.gsl.types cimport * cdef extern from "gsl/gsl_sf_dilog.h": diff --git a/src/sage/libs/gsl/eigen.pxd b/src/sage/libs/gsl/eigen.pxd index c0ac16d909b..11f849b3715 100644 --- a/src/sage/libs/gsl/eigen.pxd +++ b/src/sage/libs/gsl/eigen.pxd @@ -2,7 +2,7 @@ # distutils: libraries = GSL_LIBRARIES # distutils: library_dirs = GSL_LIBDIR # distutils: include_dirs = GSL_INCDIR -from .types cimport * +from sage.libs.gsl.types cimport * cdef extern from "gsl/gsl_eigen.h": diff --git a/src/sage/libs/gsl/elementary.pxd b/src/sage/libs/gsl/elementary.pxd index 57b03e944fa..da6f0dcae56 100644 --- a/src/sage/libs/gsl/elementary.pxd +++ b/src/sage/libs/gsl/elementary.pxd @@ -2,7 +2,7 @@ # distutils: libraries = GSL_LIBRARIES # distutils: library_dirs = GSL_LIBDIR # distutils: include_dirs = GSL_INCDIR -from .types cimport * +from sage.libs.gsl.types cimport * cdef extern from "gsl/gsl_sf_elementary.h": diff --git a/src/sage/libs/gsl/ellint.pxd b/src/sage/libs/gsl/ellint.pxd index b450272d953..49bda769ce4 100644 --- a/src/sage/libs/gsl/ellint.pxd +++ b/src/sage/libs/gsl/ellint.pxd @@ -2,7 +2,7 @@ # distutils: libraries = GSL_LIBRARIES # distutils: library_dirs = GSL_LIBDIR # distutils: include_dirs = GSL_INCDIR -from .types cimport * +from sage.libs.gsl.types cimport * cdef extern from "gsl/gsl_sf_ellint.h": diff --git a/src/sage/libs/gsl/erf.pxd b/src/sage/libs/gsl/erf.pxd index c5ea26b478e..836629ec3f5 100644 --- a/src/sage/libs/gsl/erf.pxd +++ b/src/sage/libs/gsl/erf.pxd @@ -2,7 +2,7 @@ # distutils: libraries = GSL_LIBRARIES # distutils: library_dirs = GSL_LIBDIR # distutils: include_dirs = GSL_INCDIR -from .types cimport * +from sage.libs.gsl.types cimport * cdef extern from "gsl/gsl_sf_erf.h": diff --git a/src/sage/libs/gsl/exp.pxd b/src/sage/libs/gsl/exp.pxd index 9da80ec350d..9c47c1a8237 100644 --- a/src/sage/libs/gsl/exp.pxd +++ b/src/sage/libs/gsl/exp.pxd @@ -2,7 +2,7 @@ # distutils: libraries = GSL_LIBRARIES # distutils: library_dirs = GSL_LIBDIR # distutils: include_dirs = GSL_INCDIR -from .types cimport * +from sage.libs.gsl.types cimport * cdef extern from "gsl/gsl_sf_exp.h": diff --git a/src/sage/libs/gsl/expint.pxd b/src/sage/libs/gsl/expint.pxd index 57d308fed39..5bb6c70cf52 100644 --- a/src/sage/libs/gsl/expint.pxd +++ b/src/sage/libs/gsl/expint.pxd @@ -2,7 +2,7 @@ # distutils: libraries = GSL_LIBRARIES # distutils: library_dirs = GSL_LIBDIR # distutils: include_dirs = GSL_INCDIR -from .types cimport * +from sage.libs.gsl.types cimport * cdef extern from "gsl/gsl_sf_expint.h": diff --git a/src/sage/libs/gsl/fermi_dirac.pxd b/src/sage/libs/gsl/fermi_dirac.pxd index efc04b79a9e..af5ca2d2ec7 100644 --- a/src/sage/libs/gsl/fermi_dirac.pxd +++ b/src/sage/libs/gsl/fermi_dirac.pxd @@ -2,7 +2,7 @@ # distutils: libraries = GSL_LIBRARIES # distutils: library_dirs = GSL_LIBDIR # distutils: include_dirs = GSL_INCDIR -from .types cimport * +from sage.libs.gsl.types cimport * cdef extern from "gsl/gsl_sf_fermi_dirac.h": diff --git a/src/sage/libs/gsl/fft.pxd b/src/sage/libs/gsl/fft.pxd index 18b68796df9..d798b153755 100644 --- a/src/sage/libs/gsl/fft.pxd +++ b/src/sage/libs/gsl/fft.pxd @@ -2,7 +2,7 @@ # distutils: libraries = GSL_LIBRARIES # distutils: library_dirs = GSL_LIBDIR # distutils: include_dirs = GSL_INCDIR -from .types cimport * +from sage.libs.gsl.types cimport * cdef extern from "gsl/gsl_fft.h": cdef enum gsl_fft_direction: diff --git a/src/sage/libs/gsl/gamma.pxd b/src/sage/libs/gsl/gamma.pxd index e53791ef7e9..aae7e4228dc 100644 --- a/src/sage/libs/gsl/gamma.pxd +++ b/src/sage/libs/gsl/gamma.pxd @@ -2,7 +2,7 @@ # distutils: libraries = GSL_LIBRARIES # distutils: library_dirs = GSL_LIBDIR # distutils: include_dirs = GSL_INCDIR -from .types cimport * +from sage.libs.gsl.types cimport * cdef extern from "gsl/gsl_sf_gamma.h": diff --git a/src/sage/libs/gsl/gegenbauer.pxd b/src/sage/libs/gsl/gegenbauer.pxd index a70a3693ba5..b9affccfb27 100644 --- a/src/sage/libs/gsl/gegenbauer.pxd +++ b/src/sage/libs/gsl/gegenbauer.pxd @@ -2,7 +2,7 @@ # distutils: libraries = GSL_LIBRARIES # distutils: library_dirs = GSL_LIBDIR # distutils: include_dirs = GSL_INCDIR -from .types cimport * +from sage.libs.gsl.types cimport * cdef extern from "gsl/gsl_sf_gegenbauer.h": diff --git a/src/sage/libs/gsl/histogram.pxd b/src/sage/libs/gsl/histogram.pxd index 714ec177d90..7f504a71b41 100644 --- a/src/sage/libs/gsl/histogram.pxd +++ b/src/sage/libs/gsl/histogram.pxd @@ -2,7 +2,7 @@ # distutils: libraries = GSL_LIBRARIES # distutils: library_dirs = GSL_LIBDIR # distutils: include_dirs = GSL_INCDIR -from .types cimport * +from sage.libs.gsl.types cimport * cdef extern from "gsl/gsl_histogram.h": gsl_histogram * gsl_histogram_alloc (size_t n) diff --git a/src/sage/libs/gsl/hyperg.pxd b/src/sage/libs/gsl/hyperg.pxd index 1b681337ec3..e80953d372c 100644 --- a/src/sage/libs/gsl/hyperg.pxd +++ b/src/sage/libs/gsl/hyperg.pxd @@ -2,7 +2,7 @@ # distutils: libraries = GSL_LIBRARIES # distutils: library_dirs = GSL_LIBDIR # distutils: include_dirs = GSL_INCDIR -from .types cimport * +from sage.libs.gsl.types cimport * cdef extern from "gsl/gsl_sf_hyperg.h": diff --git a/src/sage/libs/gsl/integration.pxd b/src/sage/libs/gsl/integration.pxd index ce1ddc71926..8542bf36b56 100644 --- a/src/sage/libs/gsl/integration.pxd +++ b/src/sage/libs/gsl/integration.pxd @@ -2,7 +2,7 @@ # distutils: libraries = GSL_LIBRARIES # distutils: library_dirs = GSL_LIBDIR # distutils: include_dirs = GSL_INCDIR -from .types cimport * +from sage.libs.gsl.types cimport * cdef extern from "gsl/gsl_integration.h": diff --git a/src/sage/libs/gsl/laguerre.pxd b/src/sage/libs/gsl/laguerre.pxd index ba15b616a31..c7505bc7475 100644 --- a/src/sage/libs/gsl/laguerre.pxd +++ b/src/sage/libs/gsl/laguerre.pxd @@ -2,7 +2,7 @@ # distutils: libraries = GSL_LIBRARIES # distutils: library_dirs = GSL_LIBDIR # distutils: include_dirs = GSL_INCDIR -from .types cimport * +from sage.libs.gsl.types cimport * cdef extern from "gsl/gsl_sf_laguerre.h": diff --git a/src/sage/libs/gsl/lambert.pxd b/src/sage/libs/gsl/lambert.pxd index 77811ed1309..850279a8c36 100644 --- a/src/sage/libs/gsl/lambert.pxd +++ b/src/sage/libs/gsl/lambert.pxd @@ -2,7 +2,7 @@ # distutils: libraries = GSL_LIBRARIES # distutils: library_dirs = GSL_LIBDIR # distutils: include_dirs = GSL_INCDIR -from .types cimport * +from sage.libs.gsl.types cimport * cdef extern from "gsl/gsl_sf_lambert.h": diff --git a/src/sage/libs/gsl/legendre.pxd b/src/sage/libs/gsl/legendre.pxd index ebce532b4ad..62a61a9cf63 100644 --- a/src/sage/libs/gsl/legendre.pxd +++ b/src/sage/libs/gsl/legendre.pxd @@ -2,7 +2,7 @@ # distutils: libraries = GSL_LIBRARIES # distutils: library_dirs = GSL_LIBDIR # distutils: include_dirs = GSL_INCDIR -from .types cimport * +from sage.libs.gsl.types cimport * cdef extern from "gsl/gsl_sf_legendre.h": diff --git a/src/sage/libs/gsl/linalg.pxd b/src/sage/libs/gsl/linalg.pxd index 7123ffba2a9..38075323f51 100644 --- a/src/sage/libs/gsl/linalg.pxd +++ b/src/sage/libs/gsl/linalg.pxd @@ -2,7 +2,7 @@ # distutils: libraries = GSL_LIBRARIES # distutils: library_dirs = GSL_LIBDIR # distutils: include_dirs = GSL_INCDIR -from .types cimport * +from sage.libs.gsl.types cimport * cdef extern from "gsl/gsl_linalg.h": diff --git a/src/sage/libs/gsl/log.pxd b/src/sage/libs/gsl/log.pxd index 5fc20872b04..64877bf51a7 100644 --- a/src/sage/libs/gsl/log.pxd +++ b/src/sage/libs/gsl/log.pxd @@ -2,7 +2,7 @@ # distutils: libraries = GSL_LIBRARIES # distutils: library_dirs = GSL_LIBDIR # distutils: include_dirs = GSL_INCDIR -from .types cimport * +from sage.libs.gsl.types cimport * cdef extern from "gsl/gsl_sf_log.h": diff --git a/src/sage/libs/gsl/math.pxd b/src/sage/libs/gsl/math.pxd index b552cf2d64d..6e71fca54bf 100644 --- a/src/sage/libs/gsl/math.pxd +++ b/src/sage/libs/gsl/math.pxd @@ -2,7 +2,7 @@ # distutils: libraries = GSL_LIBRARIES # distutils: library_dirs = GSL_LIBDIR # distutils: include_dirs = GSL_INCDIR -from .types cimport * +from sage.libs.gsl.types cimport * cdef extern from "gsl/gsl_math.h": bint gsl_isnan(double x) diff --git a/src/sage/libs/gsl/matrix.pxd b/src/sage/libs/gsl/matrix.pxd index fbecfaad010..4e5ab16ed79 100644 --- a/src/sage/libs/gsl/matrix.pxd +++ b/src/sage/libs/gsl/matrix.pxd @@ -2,7 +2,7 @@ # distutils: libraries = GSL_LIBRARIES # distutils: library_dirs = GSL_LIBDIR # distutils: include_dirs = GSL_INCDIR -from .types cimport * +from sage.libs.gsl.types cimport * cdef extern from "gsl/gsl_matrix_double.h": # Allocation diff --git a/src/sage/libs/gsl/matrix_complex.pxd b/src/sage/libs/gsl/matrix_complex.pxd index ba5e85842f5..ea894c74893 100644 --- a/src/sage/libs/gsl/matrix_complex.pxd +++ b/src/sage/libs/gsl/matrix_complex.pxd @@ -2,7 +2,7 @@ # distutils: libraries = GSL_LIBRARIES # distutils: library_dirs = GSL_LIBDIR # distutils: include_dirs = GSL_INCDIR -from .types cimport * +from sage.libs.gsl.types cimport * cdef extern from "gsl/gsl_matrix_complex_double.h": # Allocation diff --git a/src/sage/libs/gsl/min.pxd b/src/sage/libs/gsl/min.pxd index 539caf21a67..67982bde2b5 100644 --- a/src/sage/libs/gsl/min.pxd +++ b/src/sage/libs/gsl/min.pxd @@ -2,7 +2,7 @@ # distutils: libraries = GSL_LIBRARIES # distutils: library_dirs = GSL_LIBDIR # distutils: include_dirs = GSL_INCDIR -from .types cimport * +from sage.libs.gsl.types cimport * cdef extern from "gsl/gsl_min.h": diff --git a/src/sage/libs/gsl/monte.pxd b/src/sage/libs/gsl/monte.pxd index 65318fc3a3c..8d9ba8cd657 100644 --- a/src/sage/libs/gsl/monte.pxd +++ b/src/sage/libs/gsl/monte.pxd @@ -2,7 +2,7 @@ # distutils: libraries = GSL_LIBRARIES # distutils: library_dirs = GSL_LIBDIR # distutils: include_dirs = GSL_INCDIR -from .types cimport * +from sage.libs.gsl.types cimport * cdef extern from "gsl/gsl_monte.h": ctypedef struct gsl_monte_function: diff --git a/src/sage/libs/gsl/ntuple.pxd b/src/sage/libs/gsl/ntuple.pxd index 02c325b7546..c94f3a2211f 100644 --- a/src/sage/libs/gsl/ntuple.pxd +++ b/src/sage/libs/gsl/ntuple.pxd @@ -2,7 +2,7 @@ # distutils: libraries = GSL_LIBRARIES # distutils: library_dirs = GSL_LIBDIR # distutils: include_dirs = GSL_INCDIR -from .types cimport * +from sage.libs.gsl.types cimport * cdef extern from "gsl/gsl_ntuple.h": ctypedef struct gsl_ntuple diff --git a/src/sage/libs/gsl/permutation.pxd b/src/sage/libs/gsl/permutation.pxd index 3369e181871..443dffa4c4b 100644 --- a/src/sage/libs/gsl/permutation.pxd +++ b/src/sage/libs/gsl/permutation.pxd @@ -2,7 +2,7 @@ # distutils: libraries = GSL_LIBRARIES # distutils: library_dirs = GSL_LIBDIR # distutils: include_dirs = GSL_INCDIR -from .types cimport * +from sage.libs.gsl.types cimport * cdef extern from "gsl/gsl_permutation.h": # Allocation diff --git a/src/sage/libs/gsl/poly.pxd b/src/sage/libs/gsl/poly.pxd index aa187a02279..8ad7eb86ed2 100644 --- a/src/sage/libs/gsl/poly.pxd +++ b/src/sage/libs/gsl/poly.pxd @@ -2,7 +2,7 @@ # distutils: libraries = GSL_LIBRARIES # distutils: library_dirs = GSL_LIBDIR # distutils: include_dirs = GSL_INCDIR -from .types cimport * +from sage.libs.gsl.types cimport * cdef extern from "gsl/gsl_poly.h": diff --git a/src/sage/libs/gsl/pow_int.pxd b/src/sage/libs/gsl/pow_int.pxd index 80819c6d45c..155f1bc0629 100644 --- a/src/sage/libs/gsl/pow_int.pxd +++ b/src/sage/libs/gsl/pow_int.pxd @@ -2,7 +2,7 @@ # distutils: libraries = GSL_LIBRARIES # distutils: library_dirs = GSL_LIBDIR # distutils: include_dirs = GSL_INCDIR -from .types cimport * +from sage.libs.gsl.types cimport * cdef extern from "gsl/gsl_sf_pow_int.h": diff --git a/src/sage/libs/gsl/psi.pxd b/src/sage/libs/gsl/psi.pxd index b63011d068d..885f4001489 100644 --- a/src/sage/libs/gsl/psi.pxd +++ b/src/sage/libs/gsl/psi.pxd @@ -2,7 +2,7 @@ # distutils: libraries = GSL_LIBRARIES # distutils: library_dirs = GSL_LIBDIR # distutils: include_dirs = GSL_INCDIR -from .types cimport * +from sage.libs.gsl.types cimport * cdef extern from "gsl/gsl_sf_psi.h": diff --git a/src/sage/libs/gsl/random.pxd b/src/sage/libs/gsl/random.pxd index e107cd53103..89f792cdbb1 100644 --- a/src/sage/libs/gsl/random.pxd +++ b/src/sage/libs/gsl/random.pxd @@ -2,7 +2,7 @@ # distutils: libraries = GSL_LIBRARIES # distutils: library_dirs = GSL_LIBDIR # distutils: include_dirs = GSL_INCDIR -from .types cimport * +from sage.libs.gsl.types cimport * cdef extern from "gsl/gsl_randist.h": unsigned int gsl_ran_bernoulli ( gsl_rng * r, double p) diff --git a/src/sage/libs/gsl/rng.pxd b/src/sage/libs/gsl/rng.pxd index b792fbeb0fc..0b976df3586 100644 --- a/src/sage/libs/gsl/rng.pxd +++ b/src/sage/libs/gsl/rng.pxd @@ -2,7 +2,7 @@ # distutils: libraries = GSL_LIBRARIES # distutils: library_dirs = GSL_LIBDIR # distutils: include_dirs = GSL_INCDIR -from .types cimport * +from sage.libs.gsl.types cimport * cdef extern from "gsl/gsl_rng.h": cdef gsl_rng_type *gsl_rng_borosh13 diff --git a/src/sage/libs/gsl/roots.pxd b/src/sage/libs/gsl/roots.pxd index 5b5062af1ff..4380949a3ba 100644 --- a/src/sage/libs/gsl/roots.pxd +++ b/src/sage/libs/gsl/roots.pxd @@ -2,7 +2,7 @@ # distutils: libraries = GSL_LIBRARIES # distutils: library_dirs = GSL_LIBDIR # distutils: include_dirs = GSL_INCDIR -from .types cimport * +from sage.libs.gsl.types cimport * cdef extern from "gsl/gsl_roots.h": diff --git a/src/sage/libs/gsl/sort.pxd b/src/sage/libs/gsl/sort.pxd index f286aa23b63..bc1932a57db 100644 --- a/src/sage/libs/gsl/sort.pxd +++ b/src/sage/libs/gsl/sort.pxd @@ -2,7 +2,7 @@ # distutils: libraries = GSL_LIBRARIES # distutils: library_dirs = GSL_LIBDIR # distutils: include_dirs = GSL_INCDIR -from .types cimport * +from sage.libs.gsl.types cimport * cdef extern from "gsl/gsl_heapsort.h": diff --git a/src/sage/libs/gsl/synchrotron.pxd b/src/sage/libs/gsl/synchrotron.pxd index a555821f2d4..fd642e85113 100644 --- a/src/sage/libs/gsl/synchrotron.pxd +++ b/src/sage/libs/gsl/synchrotron.pxd @@ -2,7 +2,7 @@ # distutils: libraries = GSL_LIBRARIES # distutils: library_dirs = GSL_LIBDIR # distutils: include_dirs = GSL_INCDIR -from .types cimport * +from sage.libs.gsl.types cimport * cdef extern from "gsl/gsl_sf_synchrotron.h": diff --git a/src/sage/libs/gsl/transport.pxd b/src/sage/libs/gsl/transport.pxd index 06f483e4491..86691a48b05 100644 --- a/src/sage/libs/gsl/transport.pxd +++ b/src/sage/libs/gsl/transport.pxd @@ -2,7 +2,7 @@ # distutils: libraries = GSL_LIBRARIES # distutils: library_dirs = GSL_LIBDIR # distutils: include_dirs = GSL_INCDIR -from .types cimport * +from sage.libs.gsl.types cimport * cdef extern from "gsl/gsl_sf_transport.h": diff --git a/src/sage/libs/gsl/trig.pxd b/src/sage/libs/gsl/trig.pxd index b4e6e78919d..b7ebe9e14f2 100644 --- a/src/sage/libs/gsl/trig.pxd +++ b/src/sage/libs/gsl/trig.pxd @@ -2,7 +2,7 @@ # distutils: libraries = GSL_LIBRARIES # distutils: library_dirs = GSL_LIBDIR # distutils: include_dirs = GSL_INCDIR -from .types cimport * +from sage.libs.gsl.types cimport * cdef extern from "gsl/gsl_sf_trig.h": diff --git a/src/sage/libs/gsl/types.pxd b/src/sage/libs/gsl/types.pxd index 7a41042ef1e..00ffe3fb4ea 100644 --- a/src/sage/libs/gsl/types.pxd +++ b/src/sage/libs/gsl/types.pxd @@ -5,7 +5,7 @@ from libc.stdio cimport FILE cdef enum: GSL_SUCCESS -from .blas_types cimport * +from sage.libs.gsl.blas_types cimport * cdef extern from "gsl/gsl_mode.h": ctypedef unsigned int gsl_mode_t diff --git a/src/sage/libs/gsl/vector.pxd b/src/sage/libs/gsl/vector.pxd index 2b9a312f876..a00611fced0 100644 --- a/src/sage/libs/gsl/vector.pxd +++ b/src/sage/libs/gsl/vector.pxd @@ -2,7 +2,7 @@ # distutils: libraries = GSL_LIBRARIES # distutils: library_dirs = GSL_LIBDIR # distutils: include_dirs = GSL_INCDIR -from .types cimport * +from sage.libs.gsl.types cimport * cdef extern from "gsl/gsl_vector.h": # Allocation diff --git a/src/sage/libs/gsl/vector_complex.pxd b/src/sage/libs/gsl/vector_complex.pxd index 51c829ff5b6..7629f946720 100644 --- a/src/sage/libs/gsl/vector_complex.pxd +++ b/src/sage/libs/gsl/vector_complex.pxd @@ -2,7 +2,7 @@ # distutils: libraries = GSL_LIBRARIES # distutils: library_dirs = GSL_LIBDIR # distutils: include_dirs = GSL_INCDIR -from .types cimport * +from sage.libs.gsl.types cimport * cdef extern from "gsl/gsl_vector_complex_double.h": # Allocation diff --git a/src/sage/libs/gsl/wavelet.pxd b/src/sage/libs/gsl/wavelet.pxd index faa9c9e9500..2f94e13e6d9 100644 --- a/src/sage/libs/gsl/wavelet.pxd +++ b/src/sage/libs/gsl/wavelet.pxd @@ -2,7 +2,7 @@ # distutils: libraries = GSL_LIBRARIES # distutils: library_dirs = GSL_LIBDIR # distutils: include_dirs = GSL_INCDIR -from .types cimport * +from sage.libs.gsl.types cimport * cdef extern from "gsl/gsl_wavelet.h": diff --git a/src/sage/libs/gsl/zeta.pxd b/src/sage/libs/gsl/zeta.pxd index e80b74b0bd7..b89442a28fa 100644 --- a/src/sage/libs/gsl/zeta.pxd +++ b/src/sage/libs/gsl/zeta.pxd @@ -2,7 +2,7 @@ # distutils: libraries = GSL_LIBRARIES # distutils: library_dirs = GSL_LIBDIR # distutils: include_dirs = GSL_INCDIR -from .types cimport * +from sage.libs.gsl.types cimport * cdef extern from "gsl/gsl_sf_zeta.h": diff --git a/src/sage/libs/linbox/conversion.pxd b/src/sage/libs/linbox/conversion.pxd index f393dbb56d0..91c8f7579da 100644 --- a/src/sage/libs/linbox/conversion.pxd +++ b/src/sage/libs/linbox/conversion.pxd @@ -30,8 +30,8 @@ from libcpp.vector cimport vector as cppvector from sage.libs.gmp.mpz cimport mpz_set -from .givaro cimport Modular_uint64, ZRing, Integer -from .linbox cimport SparseMatrix_Modular_uint64, SparseMatrix_integer, DenseVector_integer +from sage.libs.linbox.givaro cimport Modular_uint64, ZRing, Integer +from sage.libs.linbox.linbox cimport SparseMatrix_Modular_uint64, SparseMatrix_integer, DenseVector_integer from sage.matrix.matrix_modn_sparse cimport Matrix_modn_sparse from sage.matrix.matrix_integer_sparse cimport Matrix_integer_sparse diff --git a/src/sage/libs/linbox/fflas.pxd b/src/sage/libs/linbox/fflas.pxd index bc21017bb82..f962d26b000 100644 --- a/src/sage/libs/linbox/fflas.pxd +++ b/src/sage/libs/linbox/fflas.pxd @@ -14,8 +14,8 @@ # distutils: extra_link_args = FFLASFFPACK_LIBEXTRA # distutils: language = c++ -from .givaro cimport Modular_double, Modular_float, Dense, Sparse -from .givaro cimport givvector, Poly1Dom +from sage.libs.linbox.givaro cimport Modular_double, Modular_float, Dense, Sparse +from sage.libs.linbox.givaro cimport givvector, Poly1Dom from libcpp.vector cimport vector from libcpp cimport bool ctypedef Poly1Dom[Modular_double, Dense] PolynomialRing_Modular_double diff --git a/src/sage/libs/linbox/linbox.pxd b/src/sage/libs/linbox/linbox.pxd index 4fa7f80e0bc..e4064118461 100644 --- a/src/sage/libs/linbox/linbox.pxd +++ b/src/sage/libs/linbox/linbox.pxd @@ -9,7 +9,7 @@ from libc.stdint cimport uint32_t, uint64_t from libcpp.vector cimport vector as cppvector -from .givaro cimport * +from sage.libs.linbox.givaro cimport * cdef extern from "linbox/matrix/dense-matrix.h": ## template ::Dense > diff --git a/src/sage/libs/linbox/linbox_flint_interface.pyx b/src/sage/libs/linbox/linbox_flint_interface.pyx index 7d0454a1265..293cd9050d3 100644 --- a/src/sage/libs/linbox/linbox_flint_interface.pyx +++ b/src/sage/libs/linbox/linbox_flint_interface.pyx @@ -41,7 +41,7 @@ from sage.libs.flint.fmpz_poly cimport fmpz_poly_set_coeff_mpz, fmpz_poly_fit_le cimport sage.libs.linbox.givaro as givaro cimport sage.libs.linbox.linbox as linbox -from .linbox cimport PolynomialRing_integer +from sage.libs.linbox.linbox cimport PolynomialRing_integer cdef void fmpz_mat_get_linbox(linbox.DenseMatrix_integer& A, fmpz_mat_t m): diff --git a/src/sage/libs/mpmath/ext_libmp.pyx b/src/sage/libs/mpmath/ext_libmp.pyx index d63511d4bfe..57d119523fb 100644 --- a/src/sage/libs/mpmath/ext_libmp.pyx +++ b/src/sage/libs/mpmath/ext_libmp.pyx @@ -2,7 +2,7 @@ """ Faster versions of some key functions in mpmath.libmp """ -from .ext_impl cimport * +from sage.libs.mpmath.ext_impl cimport * from sage.libs.gmp.all cimport * # the next line is used by mpmath diff --git a/src/sage/libs/mpmath/ext_main.pxd b/src/sage/libs/mpmath/ext_main.pxd index a3f040af6b7..ea3f7bba6d4 100644 --- a/src/sage/libs/mpmath/ext_main.pxd +++ b/src/sage/libs/mpmath/ext_main.pxd @@ -1,2 +1,2 @@ # sage_setup: distribution = sagemath-mpmath -from .ext_impl cimport * +from sage.libs.mpmath.ext_impl cimport * diff --git a/src/sage/libs/mpmath/ext_main.pyx b/src/sage/libs/mpmath/ext_main.pyx index 5bb8c052211..a979cdb9d13 100644 --- a/src/sage/libs/mpmath/ext_main.pyx +++ b/src/sage/libs/mpmath/ext_main.pyx @@ -40,7 +40,7 @@ DEF S_INF = 3 DEF S_NINF = 4 DEF S_NAN = 5 -from .ext_impl cimport * +from sage.libs.mpmath.ext_impl cimport * import sage.libs.mpmath._vendor.mpmath.rational as rationallib import sage.libs.mpmath._vendor.mpmath.libmp as libmp diff --git a/src/sage/libs/ntl/GF2.pxd b/src/sage/libs/ntl/GF2.pxd index 55b8db01f39..1d5d9ea49d7 100644 --- a/src/sage/libs/ntl/GF2.pxd +++ b/src/sage/libs/ntl/GF2.pxd @@ -1,5 +1,5 @@ # sage_setup: distribution = sagemath-ntl -from .types cimport GF2_c +from sage.libs.ntl.types cimport GF2_c cdef extern from "ntlwrap.h": diff --git a/src/sage/libs/ntl/GF2E.pxd b/src/sage/libs/ntl/GF2E.pxd index 54d32d3ff0c..901df87a4ef 100644 --- a/src/sage/libs/ntl/GF2E.pxd +++ b/src/sage/libs/ntl/GF2E.pxd @@ -1,5 +1,5 @@ # sage_setup: distribution = sagemath-ntl -from .types cimport GF2E_c, GF2X_c, GF2_c, GF2XModulus_c, ZZ_c +from sage.libs.ntl.types cimport GF2E_c, GF2X_c, GF2_c, GF2XModulus_c, ZZ_c cdef extern from "ntlwrap.h": diff --git a/src/sage/libs/ntl/GF2EX.pxd b/src/sage/libs/ntl/GF2EX.pxd index 3947aa5cf0d..4648aaa7429 100644 --- a/src/sage/libs/ntl/GF2EX.pxd +++ b/src/sage/libs/ntl/GF2EX.pxd @@ -1,5 +1,5 @@ # sage_setup: distribution = sagemath-ntl -from .types cimport GF2EX_c +from sage.libs.ntl.types cimport GF2EX_c cdef extern from "ntlwrap.h": diff --git a/src/sage/libs/ntl/GF2X.pxd b/src/sage/libs/ntl/GF2X.pxd index 7f8154a79ed..e3da7f38126 100644 --- a/src/sage/libs/ntl/GF2X.pxd +++ b/src/sage/libs/ntl/GF2X.pxd @@ -1,5 +1,5 @@ # sage_setup: distribution = sagemath-ntl -from .types cimport GF2X_c, GF2_c, GF2XModulus_c, vec_GF2_c, ZZ_c +from sage.libs.ntl.types cimport GF2X_c, GF2_c, GF2XModulus_c, vec_GF2_c, ZZ_c cdef extern from "ntlwrap.h": diff --git a/src/sage/libs/ntl/ZZ.pxd b/src/sage/libs/ntl/ZZ.pxd index 2567d03a9f6..faf139e6848 100644 --- a/src/sage/libs/ntl/ZZ.pxd +++ b/src/sage/libs/ntl/ZZ.pxd @@ -1,7 +1,7 @@ # sage_setup: distribution = sagemath-ntl # distutils: depends = NTL/ZZ.h -from .types cimport ZZ_c +from sage.libs.ntl.types cimport ZZ_c cdef extern from "ntlwrap.h": diff --git a/src/sage/libs/ntl/ZZX.pxd b/src/sage/libs/ntl/ZZX.pxd index 9183002e3d3..e5511934cca 100644 --- a/src/sage/libs/ntl/ZZX.pxd +++ b/src/sage/libs/ntl/ZZX.pxd @@ -2,7 +2,7 @@ # distutils: depends = NTL/ZZ.h from sage.libs.gmp.types cimport mpz_t -from .types cimport ZZ_c, vec_ZZ_c, ZZX_c +from sage.libs.ntl.types cimport ZZ_c, vec_ZZ_c, ZZX_c cdef extern from *: diff --git a/src/sage/libs/ntl/ZZ_p.pxd b/src/sage/libs/ntl/ZZ_p.pxd index 3f0e1e9acc5..0611bc4e1b6 100644 --- a/src/sage/libs/ntl/ZZ_p.pxd +++ b/src/sage/libs/ntl/ZZ_p.pxd @@ -1,7 +1,7 @@ # sage_setup: distribution = sagemath-ntl # distutils: depends = NTL/ZZ.h -from .types cimport ZZ_c, ZZ_p_c +from sage.libs.ntl.types cimport ZZ_c, ZZ_p_c cdef extern from "ntlwrap.h": diff --git a/src/sage/libs/ntl/ZZ_pE.pxd b/src/sage/libs/ntl/ZZ_pE.pxd index 5efcab4d255..f8842659911 100644 --- a/src/sage/libs/ntl/ZZ_pE.pxd +++ b/src/sage/libs/ntl/ZZ_pE.pxd @@ -1,7 +1,7 @@ # sage_setup: distribution = sagemath-ntl # distutils: depends = NTL/ZZ.h -from .types cimport ZZ_c, ZZ_p_c, ZZ_pX_c, ZZ_pE_c +from sage.libs.ntl.types cimport ZZ_c, ZZ_p_c, ZZ_pX_c, ZZ_pE_c cdef extern from "ntlwrap.h": diff --git a/src/sage/libs/ntl/ZZ_pEX.pxd b/src/sage/libs/ntl/ZZ_pEX.pxd index f86c9a8165e..e5f2b12d62e 100644 --- a/src/sage/libs/ntl/ZZ_pEX.pxd +++ b/src/sage/libs/ntl/ZZ_pEX.pxd @@ -1,7 +1,7 @@ # sage_setup: distribution = sagemath-ntl # distutils: depends = NTL/ZZ.h -from .types cimport (ZZ_c, ZZ_p_c, ZZ_pContext_c, ZZ_pE_c, vec_ZZ_p_c, +from sage.libs.ntl.types cimport (ZZ_c, ZZ_p_c, ZZ_pContext_c, ZZ_pE_c, vec_ZZ_p_c, vec_ZZ_pE_c, ZZ_pEX_c, ZZ_pEX_Modulus_c) diff --git a/src/sage/libs/ntl/ZZ_pX.pxd b/src/sage/libs/ntl/ZZ_pX.pxd index c685c3175d8..d54625fcebf 100644 --- a/src/sage/libs/ntl/ZZ_pX.pxd +++ b/src/sage/libs/ntl/ZZ_pX.pxd @@ -1,7 +1,7 @@ # sage_setup: distribution = sagemath-ntl # distutils: depends = NTL/ZZ.h -from .types cimport (ZZ_c, ZZX_c, ZZ_p_c, vec_ZZ_p_c, ZZ_pContext_c, +from sage.libs.ntl.types cimport (ZZ_c, ZZX_c, ZZ_p_c, vec_ZZ_p_c, ZZ_pContext_c, ZZ_pX_c, ZZ_pX_Modulus_c, ZZ_pX_Multiplier_c) diff --git a/src/sage/libs/ntl/conversion.pxd b/src/sage/libs/ntl/conversion.pxd index 9bb5c204973..04e2f90bc04 100644 --- a/src/sage/libs/ntl/conversion.pxd +++ b/src/sage/libs/ntl/conversion.pxd @@ -24,7 +24,7 @@ conventions for conversion functions # http://www.gnu.org/licenses/ #***************************************************************************** -from .types cimport mat_ZZ_p_c +from sage.libs.ntl.types cimport mat_ZZ_p_c from sage.libs.ntl.ntl_ZZ_pContext cimport ntl_ZZ_pContext_class from sage.libs.ntl.ntl_ZZ_p cimport ntl_ZZ_p diff --git a/src/sage/libs/ntl/convert.pxd b/src/sage/libs/ntl/convert.pxd index fc548c81e95..79ed9bcf648 100644 --- a/src/sage/libs/ntl/convert.pxd +++ b/src/sage/libs/ntl/convert.pxd @@ -1,5 +1,5 @@ # sage_setup: distribution = sagemath-ntl -from .types cimport ZZ_c +from sage.libs.ntl.types cimport ZZ_c from sage.libs.gmp.types cimport mpz_t, mpz_srcptr cdef void ZZ_to_mpz(mpz_t output, ZZ_c* x) diff --git a/src/sage/libs/ntl/error.pyx b/src/sage/libs/ntl/error.pyx index 3040457f117..06fbe1fe6dc 100644 --- a/src/sage/libs/ntl/error.pyx +++ b/src/sage/libs/ntl/error.pyx @@ -29,8 +29,8 @@ AUTHOR: #***************************************************************************** -from .ntl_tools cimport ErrorMsgCallback -from ...cpython.string cimport char_to_str +from sage.libs.ntl.ntl_tools cimport ErrorMsgCallback +from sage.cpython.string cimport char_to_str class NTLError(RuntimeError): diff --git a/src/sage/libs/ntl/lzz_p.pxd b/src/sage/libs/ntl/lzz_p.pxd index a5ca61c57b6..3d30b2f38c4 100644 --- a/src/sage/libs/ntl/lzz_p.pxd +++ b/src/sage/libs/ntl/lzz_p.pxd @@ -1,7 +1,7 @@ # sage_setup: distribution = sagemath-ntl # distutils: depends = NTL/ZZ.h -from .types cimport zz_p_c +from sage.libs.ntl.types cimport zz_p_c cdef extern from "ntlwrap.h": long zz_p_rep "rep"(zz_p_c x) diff --git a/src/sage/libs/ntl/lzz_pX.pxd b/src/sage/libs/ntl/lzz_pX.pxd index c8a2ab84f24..e747309ceb9 100644 --- a/src/sage/libs/ntl/lzz_pX.pxd +++ b/src/sage/libs/ntl/lzz_pX.pxd @@ -1,7 +1,7 @@ # sage_setup: distribution = sagemath-ntl # distutils: depends = NTL/ZZ.h -from .types cimport ZZ_c, zz_p_c, zz_pX_c, zz_pX_Modulus_c +from sage.libs.ntl.types cimport ZZ_c, zz_p_c, zz_pX_c, zz_pX_Modulus_c cdef extern from "ntlwrap.h": diff --git a/src/sage/libs/ntl/mat_GF2.pxd b/src/sage/libs/ntl/mat_GF2.pxd index b168735c691..0405a90c646 100644 --- a/src/sage/libs/ntl/mat_GF2.pxd +++ b/src/sage/libs/ntl/mat_GF2.pxd @@ -1,5 +1,5 @@ # sage_setup: distribution = sagemath-ntl -from .types cimport mat_GF2_c, vec_GF2_c, GF2_c +from sage.libs.ntl.types cimport mat_GF2_c, vec_GF2_c, GF2_c cdef extern from "ntlwrap.h": diff --git a/src/sage/libs/ntl/mat_GF2E.pxd b/src/sage/libs/ntl/mat_GF2E.pxd index ead17fc20b7..c6d2c615dbd 100644 --- a/src/sage/libs/ntl/mat_GF2E.pxd +++ b/src/sage/libs/ntl/mat_GF2E.pxd @@ -1,5 +1,5 @@ # sage_setup: distribution = sagemath-ntl -from .types cimport mat_GF2E_c, vec_GF2E_c, GF2E_c +from sage.libs.ntl.types cimport mat_GF2E_c, vec_GF2E_c, GF2E_c cdef extern from "ntlwrap.h": diff --git a/src/sage/libs/ntl/mat_ZZ.pxd b/src/sage/libs/ntl/mat_ZZ.pxd index f569606ca58..a33fc2b1a1a 100644 --- a/src/sage/libs/ntl/mat_ZZ.pxd +++ b/src/sage/libs/ntl/mat_ZZ.pxd @@ -1,5 +1,5 @@ # sage_setup: distribution = sagemath-ntl -from .types cimport mat_ZZ_c, ZZ_c, ZZX_c +from sage.libs.ntl.types cimport mat_ZZ_c, ZZ_c, ZZX_c cdef extern from "ntlwrap.h": diff --git a/src/sage/libs/ntl/ntl_GF2.pxd b/src/sage/libs/ntl/ntl_GF2.pxd index 3edd0d30672..1f388a00ff0 100644 --- a/src/sage/libs/ntl/ntl_GF2.pxd +++ b/src/sage/libs/ntl/ntl_GF2.pxd @@ -1,5 +1,5 @@ # sage_setup: distribution = sagemath-ntl -from .types cimport GF2_c +from sage.libs.ntl.types cimport GF2_c cdef class ntl_GF2(): cdef GF2_c x diff --git a/src/sage/libs/ntl/ntl_GF2E.pxd b/src/sage/libs/ntl/ntl_GF2E.pxd index b4e1d8146c5..fd3825f9b37 100644 --- a/src/sage/libs/ntl/ntl_GF2E.pxd +++ b/src/sage/libs/ntl/ntl_GF2E.pxd @@ -1,6 +1,6 @@ # sage_setup: distribution = sagemath-ntl -from .types cimport GF2E_c -from .ntl_GF2EContext cimport ntl_GF2EContext_class +from sage.libs.ntl.types cimport GF2E_c +from sage.libs.ntl.ntl_GF2EContext cimport ntl_GF2EContext_class cdef class ntl_GF2E(): cdef GF2E_c x diff --git a/src/sage/libs/ntl/ntl_GF2E.pyx b/src/sage/libs/ntl/ntl_GF2E.pyx index 33f9b431559..0486595b64f 100644 --- a/src/sage/libs/ntl/ntl_GF2E.pyx +++ b/src/sage/libs/ntl/ntl_GF2E.pyx @@ -28,10 +28,10 @@ include 'misc.pxi' include 'decl.pxi' from cpython.object cimport Py_EQ, Py_NE -from .ntl_ZZ cimport ntl_ZZ -from .ntl_GF2 cimport ntl_GF2 -from .ntl_GF2X cimport ntl_GF2X -from .ntl_GF2EContext cimport ntl_GF2EContext_class +from sage.libs.ntl.ntl_ZZ cimport ntl_ZZ +from sage.libs.ntl.ntl_GF2 cimport ntl_GF2 +from sage.libs.ntl.ntl_GF2X cimport ntl_GF2X +from sage.libs.ntl.ntl_GF2EContext cimport ntl_GF2EContext_class from .ntl_GF2EContext import ntl_GF2EContext from sage.libs.ntl.ntl_ZZ import unpickle_class_args from sage.misc.randstate cimport current_randstate diff --git a/src/sage/libs/ntl/ntl_GF2EContext.pxd b/src/sage/libs/ntl/ntl_GF2EContext.pxd index e1917ce7b3a..c4140e3b5c0 100644 --- a/src/sage/libs/ntl/ntl_GF2EContext.pxd +++ b/src/sage/libs/ntl/ntl_GF2EContext.pxd @@ -1,6 +1,6 @@ # sage_setup: distribution = sagemath-ntl -from .types cimport GF2EContext_c -from .ntl_GF2X cimport ntl_GF2X +from sage.libs.ntl.types cimport GF2EContext_c +from sage.libs.ntl.ntl_GF2X cimport ntl_GF2X cdef class ntl_GF2EContext_class(): cdef GF2EContext_c x diff --git a/src/sage/libs/ntl/ntl_GF2EX.pxd b/src/sage/libs/ntl/ntl_GF2EX.pxd index ee46805173d..5113ee1f612 100644 --- a/src/sage/libs/ntl/ntl_GF2EX.pxd +++ b/src/sage/libs/ntl/ntl_GF2EX.pxd @@ -1,7 +1,7 @@ # sage_setup: distribution = sagemath-ntl -from .types cimport GF2EX_c -from .ntl_GF2EContext cimport ntl_GF2EContext_class -from .ntl_GF2E cimport ntl_GF2E +from sage.libs.ntl.types cimport GF2EX_c +from sage.libs.ntl.ntl_GF2EContext cimport ntl_GF2EContext_class +from sage.libs.ntl.ntl_GF2E cimport ntl_GF2E cdef class ntl_GF2EX(): cdef GF2EX_c x diff --git a/src/sage/libs/ntl/ntl_GF2EX.pyx b/src/sage/libs/ntl/ntl_GF2EX.pyx index 6028c2dfad4..b9705def468 100644 --- a/src/sage/libs/ntl/ntl_GF2EX.pyx +++ b/src/sage/libs/ntl/ntl_GF2EX.pyx @@ -30,8 +30,8 @@ include 'decl.pxi' from cpython.object cimport Py_EQ, Py_NE from .ntl_ZZ import unpickle_class_args from .ntl_GF2EContext import ntl_GF2EContext -from .ntl_GF2EContext cimport ntl_GF2EContext_class -from .ntl_GF2E cimport ntl_GF2E +from sage.libs.ntl.ntl_GF2EContext cimport ntl_GF2EContext_class +from sage.libs.ntl.ntl_GF2E cimport ntl_GF2E ############################################################################## # diff --git a/src/sage/libs/ntl/ntl_GF2X.pxd b/src/sage/libs/ntl/ntl_GF2X.pxd index 5b4e9a2f3e6..f72db7c0404 100644 --- a/src/sage/libs/ntl/ntl_GF2X.pxd +++ b/src/sage/libs/ntl/ntl_GF2X.pxd @@ -1,5 +1,5 @@ # sage_setup: distribution = sagemath-ntl -from .types cimport GF2X_c +from sage.libs.ntl.types cimport GF2X_c cdef class ntl_GF2X(): cdef GF2X_c x diff --git a/src/sage/libs/ntl/ntl_GF2X.pyx b/src/sage/libs/ntl/ntl_GF2X.pyx index 4ffcc951e21..fab3e4ebb40 100644 --- a/src/sage/libs/ntl/ntl_GF2X.pyx +++ b/src/sage/libs/ntl/ntl_GF2X.pyx @@ -31,7 +31,7 @@ from cpython.object cimport Py_EQ, Py_NE from sage.rings.integer cimport Integer from .ntl_ZZ import unpickle_class_value -from .ntl_GF2 cimport ntl_GF2 +from sage.libs.ntl.ntl_GF2 cimport ntl_GF2 ############################################################################## diff --git a/src/sage/libs/ntl/ntl_ZZX.pxd b/src/sage/libs/ntl/ntl_ZZX.pxd index 1222691f7a0..6e25e48f17e 100644 --- a/src/sage/libs/ntl/ntl_ZZX.pxd +++ b/src/sage/libs/ntl/ntl_ZZX.pxd @@ -1,5 +1,5 @@ # sage_setup: distribution = sagemath-ntl -from .types cimport ZZX_c +from sage.libs.ntl.types cimport ZZX_c cdef class ntl_ZZX(): cdef ZZX_c x diff --git a/src/sage/libs/ntl/ntl_ZZ_p.pxd b/src/sage/libs/ntl/ntl_ZZ_p.pxd index 9ae18c06869..9d2bd765bb1 100644 --- a/src/sage/libs/ntl/ntl_ZZ_p.pxd +++ b/src/sage/libs/ntl/ntl_ZZ_p.pxd @@ -1,6 +1,6 @@ # sage_setup: distribution = sagemath-ntl -from .types cimport ZZ_p_c -from .ntl_ZZ_pContext cimport ntl_ZZ_pContext_class +from sage.libs.ntl.types cimport ZZ_p_c +from sage.libs.ntl.ntl_ZZ_pContext cimport ntl_ZZ_pContext_class cdef class ntl_ZZ_p(): cdef ZZ_p_c x diff --git a/src/sage/libs/ntl/ntl_ZZ_pContext.pxd b/src/sage/libs/ntl/ntl_ZZ_pContext.pxd index 1ba433cc900..54cb9b0ca2b 100644 --- a/src/sage/libs/ntl/ntl_ZZ_pContext.pxd +++ b/src/sage/libs/ntl/ntl_ZZ_pContext.pxd @@ -1,7 +1,7 @@ # sage_setup: distribution = sagemath-ntl -from .types cimport ZZ_pContext_c -from .ntl_ZZ cimport ntl_ZZ -from .types cimport ZZ_c +from sage.libs.ntl.types cimport ZZ_pContext_c +from sage.libs.ntl.ntl_ZZ cimport ntl_ZZ +from sage.libs.ntl.types cimport ZZ_c cdef class ntl_ZZ_pContext_class(): diff --git a/src/sage/libs/ntl/ntl_ZZ_pE.pxd b/src/sage/libs/ntl/ntl_ZZ_pE.pxd index e0563440b41..cf2a46f6024 100644 --- a/src/sage/libs/ntl/ntl_ZZ_pE.pxd +++ b/src/sage/libs/ntl/ntl_ZZ_pE.pxd @@ -1,7 +1,7 @@ # sage_setup: distribution = sagemath-ntl -from .types cimport ZZ_pE_c -from .ntl_ZZ_pEContext cimport ntl_ZZ_pEContext_class -from .ntl_ZZ_pX cimport ntl_ZZ_pX +from sage.libs.ntl.types cimport ZZ_pE_c +from sage.libs.ntl.ntl_ZZ_pEContext cimport ntl_ZZ_pEContext_class +from sage.libs.ntl.ntl_ZZ_pX cimport ntl_ZZ_pX cdef class ntl_ZZ_pE(): cdef ZZ_pE_c x diff --git a/src/sage/libs/ntl/ntl_ZZ_pEContext.pxd b/src/sage/libs/ntl/ntl_ZZ_pEContext.pxd index d4f6b03221b..d0e169bd4dc 100644 --- a/src/sage/libs/ntl/ntl_ZZ_pEContext.pxd +++ b/src/sage/libs/ntl/ntl_ZZ_pEContext.pxd @@ -1,8 +1,8 @@ # sage_setup: distribution = sagemath-ntl -from .types cimport ZZ_pContext_c, ZZ_pEContext_c -from .ntl_ZZ_pContext cimport ntl_ZZ_pContext_class -from .ntl_ZZ_pX cimport ntl_ZZ_pX -from .types cimport ZZ_pX_Modulus_c +from sage.libs.ntl.types cimport ZZ_pContext_c, ZZ_pEContext_c +from sage.libs.ntl.ntl_ZZ_pContext cimport ntl_ZZ_pContext_class +from sage.libs.ntl.ntl_ZZ_pX cimport ntl_ZZ_pX +from sage.libs.ntl.types cimport ZZ_pX_Modulus_c cdef struct ZZ_pEContext_ptrs: diff --git a/src/sage/libs/ntl/ntl_ZZ_pEX.pxd b/src/sage/libs/ntl/ntl_ZZ_pEX.pxd index 455bef5af54..10c3b0a4627 100644 --- a/src/sage/libs/ntl/ntl_ZZ_pEX.pxd +++ b/src/sage/libs/ntl/ntl_ZZ_pEX.pxd @@ -1,6 +1,6 @@ # sage_setup: distribution = sagemath-ntl -from .types cimport ZZ_pEX_c -from .ntl_ZZ_pEContext cimport ntl_ZZ_pEContext_class +from sage.libs.ntl.types cimport ZZ_pEX_c +from sage.libs.ntl.ntl_ZZ_pEContext cimport ntl_ZZ_pEContext_class cdef class ntl_ZZ_pEX(): cdef ZZ_pEX_c x diff --git a/src/sage/libs/ntl/ntl_ZZ_pX.pxd b/src/sage/libs/ntl/ntl_ZZ_pX.pxd index b7d0e006607..c4b14b25ade 100644 --- a/src/sage/libs/ntl/ntl_ZZ_pX.pxd +++ b/src/sage/libs/ntl/ntl_ZZ_pX.pxd @@ -1,5 +1,5 @@ # sage_setup: distribution = sagemath-ntl -from .ZZ_pX cimport * +from sage.libs.ntl.ZZ_pX cimport * from sage.libs.ntl.ntl_ZZ_pContext cimport ntl_ZZ_pContext_class cdef class ntl_ZZ_pX(): diff --git a/src/sage/libs/ntl/ntl_lzz_p.pxd b/src/sage/libs/ntl/ntl_lzz_p.pxd index 696de4a0a28..dd35d65da88 100644 --- a/src/sage/libs/ntl/ntl_lzz_p.pxd +++ b/src/sage/libs/ntl/ntl_lzz_p.pxd @@ -1,6 +1,6 @@ # sage_setup: distribution = sagemath-ntl -from .lzz_p cimport * -from .ntl_lzz_pContext cimport ntl_zz_pContext_class +from sage.libs.ntl.lzz_p cimport * +from sage.libs.ntl.ntl_lzz_pContext cimport ntl_zz_pContext_class cdef class ntl_zz_p(): cdef zz_p_c x diff --git a/src/sage/libs/ntl/ntl_lzz_pContext.pxd b/src/sage/libs/ntl/ntl_lzz_pContext.pxd index 891f7b7bc59..af749c63bf5 100644 --- a/src/sage/libs/ntl/ntl_lzz_pContext.pxd +++ b/src/sage/libs/ntl/ntl_lzz_pContext.pxd @@ -1,5 +1,5 @@ # sage_setup: distribution = sagemath-ntl -from .types cimport zz_pContext_c +from sage.libs.ntl.types cimport zz_pContext_c cdef class ntl_zz_pContext_class(): cdef zz_pContext_c x diff --git a/src/sage/libs/ntl/ntl_mat_GF2.pxd b/src/sage/libs/ntl/ntl_mat_GF2.pxd index 546f8bc87a4..63fdbdd41b9 100644 --- a/src/sage/libs/ntl/ntl_mat_GF2.pxd +++ b/src/sage/libs/ntl/ntl_mat_GF2.pxd @@ -1,6 +1,6 @@ # sage_setup: distribution = sagemath-ntl -from .types cimport mat_GF2_c -from .ntl_GF2 cimport ntl_GF2 +from sage.libs.ntl.types cimport mat_GF2_c +from sage.libs.ntl.ntl_GF2 cimport ntl_GF2 cdef class ntl_mat_GF2(): cdef mat_GF2_c x diff --git a/src/sage/libs/ntl/ntl_mat_GF2.pyx b/src/sage/libs/ntl/ntl_mat_GF2.pyx index e66dfd030f2..87cc2b56795 100644 --- a/src/sage/libs/ntl/ntl_mat_GF2.pyx +++ b/src/sage/libs/ntl/ntl_mat_GF2.pyx @@ -41,7 +41,7 @@ include 'misc.pxi' include 'decl.pxi' from cpython.object cimport Py_EQ, Py_NE -from .ntl_GF2 cimport ntl_GF2 +from sage.libs.ntl.ntl_GF2 cimport ntl_GF2 from sage.rings.integer cimport Integer from sage.libs.ntl.ntl_ZZ import unpickle_class_args diff --git a/src/sage/libs/ntl/ntl_mat_GF2E.pxd b/src/sage/libs/ntl/ntl_mat_GF2E.pxd index dde49e8a6f4..47748a341b7 100644 --- a/src/sage/libs/ntl/ntl_mat_GF2E.pxd +++ b/src/sage/libs/ntl/ntl_mat_GF2E.pxd @@ -1,7 +1,7 @@ # sage_setup: distribution = sagemath-ntl -from .types cimport mat_GF2E_c -from .ntl_GF2EContext cimport ntl_GF2EContext_class -from .ntl_GF2E cimport ntl_GF2E +from sage.libs.ntl.types cimport mat_GF2E_c +from sage.libs.ntl.ntl_GF2EContext cimport ntl_GF2EContext_class +from sage.libs.ntl.ntl_GF2E cimport ntl_GF2E cdef class ntl_mat_GF2E(): cdef mat_GF2E_c x diff --git a/src/sage/libs/ntl/ntl_mat_GF2E.pyx b/src/sage/libs/ntl/ntl_mat_GF2E.pyx index 483e49654a2..62d3877f272 100644 --- a/src/sage/libs/ntl/ntl_mat_GF2E.pyx +++ b/src/sage/libs/ntl/ntl_mat_GF2E.pyx @@ -38,9 +38,9 @@ include 'misc.pxi' include 'decl.pxi' from cpython.object cimport Py_EQ, Py_NE -from .ntl_GF2E cimport ntl_GF2E +from sage.libs.ntl.ntl_GF2E cimport ntl_GF2E from .ntl_GF2EContext import ntl_GF2EContext -from .ntl_GF2EContext cimport ntl_GF2EContext_class +from sage.libs.ntl.ntl_GF2EContext cimport ntl_GF2EContext_class from sage.rings.integer cimport Integer from sage.misc.randstate cimport randstate, current_randstate diff --git a/src/sage/libs/ntl/ntl_mat_ZZ.pxd b/src/sage/libs/ntl/ntl_mat_ZZ.pxd index 6f4afc92dc2..bb51160564a 100644 --- a/src/sage/libs/ntl/ntl_mat_ZZ.pxd +++ b/src/sage/libs/ntl/ntl_mat_ZZ.pxd @@ -1,5 +1,5 @@ # sage_setup: distribution = sagemath-ntl -from .types cimport mat_ZZ_c +from sage.libs.ntl.types cimport mat_ZZ_c cdef class ntl_mat_ZZ(): cdef mat_ZZ_c x diff --git a/src/sage/libs/ntl/vec_GF2.pxd b/src/sage/libs/ntl/vec_GF2.pxd index 5b1fa1c6c69..38d1751410d 100644 --- a/src/sage/libs/ntl/vec_GF2.pxd +++ b/src/sage/libs/ntl/vec_GF2.pxd @@ -1,5 +1,5 @@ # sage_setup: distribution = sagemath-ntl -from .types cimport vec_GF2_c, GF2_c +from sage.libs.ntl.types cimport vec_GF2_c, GF2_c cdef extern from "ntlwrap.h": diff --git a/src/sage/libs/ntl/vec_GF2E.pxd b/src/sage/libs/ntl/vec_GF2E.pxd index 251a47a2ccc..2d0d6436d51 100644 --- a/src/sage/libs/ntl/vec_GF2E.pxd +++ b/src/sage/libs/ntl/vec_GF2E.pxd @@ -1,2 +1,2 @@ # sage_setup: distribution = sagemath-ntl -from .types cimport vec_GF2E_c +from sage.libs.ntl.types cimport vec_GF2E_c diff --git a/src/sage/libs/pari/convert_flint.pyx b/src/sage/libs/pari/convert_flint.pyx index 07dd6cfc3dd..0284fd8b5d8 100644 --- a/src/sage/libs/pari/convert_flint.pyx +++ b/src/sage/libs/pari/convert_flint.pyx @@ -28,7 +28,7 @@ from sage.libs.flint.fmpq_mat cimport fmpq_mat_nrows, fmpq_mat_ncols, fmpq_mat_e from cypari2.paridecl cimport * from cypari2.stack cimport new_gen -from .convert_gmp cimport _new_GEN_from_mpz_t +from sage.libs.pari.convert_gmp cimport _new_GEN_from_mpz_t cdef inline GEN _new_GEN_from_fmpz_t(fmpz_t value): diff --git a/src/sage/libs/pari/convert_sage.pyx b/src/sage/libs/pari/convert_sage.pyx index f334f3a560d..466d421deaf 100644 --- a/src/sage/libs/pari/convert_sage.pyx +++ b/src/sage/libs/pari/convert_sage.pyx @@ -23,7 +23,7 @@ from cypari2.types cimport (GEN, typ, t_INT, t_FRAC, t_REAL, t_COMPLEX, lg, precp) from cypari2.paridecl cimport * from cypari2.stack cimport new_gen -from .convert_gmp cimport INT_to_mpz, new_gen_from_mpz_t, new_gen_from_mpq_t, INTFRAC_to_mpq +from sage.libs.pari.convert_gmp cimport INT_to_mpz, new_gen_from_mpz_t, new_gen_from_mpq_t, INTFRAC_to_mpq from sage.ext.stdsage cimport PY_NEW from sage.libs.gmp.mpz cimport mpz_fits_slong_p, mpz_sgn, mpz_get_ui, mpz_set, mpz_set_si, mpz_set_ui diff --git a/src/sage/libs/pari/convert_sage_matrix.pyx b/src/sage/libs/pari/convert_sage_matrix.pyx index dd14eb17abf..4c86ec95fcb 100644 --- a/src/sage/libs/pari/convert_sage_matrix.pyx +++ b/src/sage/libs/pari/convert_sage_matrix.pyx @@ -12,7 +12,7 @@ from sage.matrix.args cimport (MatrixArgs, MA_ENTRIES_SEQ_SEQ, MA_ENTRIES_SEQ_FLAT, MA_ENTRIES_CALLABLE, MA_ENTRIES_UNKNOWN, MA_ENTRIES_SCALAR) -from .convert_sage cimport gen_to_sage +from sage.libs.pari.convert_sage cimport gen_to_sage def gen_to_sage_matrix(Gen z, locals=None): cdef GEN g = z.g diff --git a/src/sage/matrix/change_ring.pyx b/src/sage/matrix/change_ring.pyx index c14d6540849..53e840b4663 100644 --- a/src/sage/matrix/change_ring.pyx +++ b/src/sage/matrix/change_ring.pyx @@ -3,8 +3,8 @@ Functions for changing the base ring of matrices quickly """ from .matrix_space import MatrixSpace -from .matrix_real_double_dense cimport Matrix_real_double_dense -from .matrix_integer_dense cimport Matrix_integer_dense +from sage.matrix.matrix_real_double_dense cimport Matrix_real_double_dense +from sage.matrix.matrix_integer_dense cimport Matrix_integer_dense from sage.rings.real_double import RDF diff --git a/src/sage/matrix/constructor.pyx b/src/sage/matrix/constructor.pyx index e036562b56b..82151080421 100644 --- a/src/sage/matrix/constructor.pyx +++ b/src/sage/matrix/constructor.pyx @@ -15,7 +15,7 @@ General matrix Constructor and display options # http://www.gnu.org/licenses/ #***************************************************************************** -from .args cimport MatrixArgs +from sage.matrix.args cimport MatrixArgs from sage.structure.global_options import GlobalOptions diff --git a/src/sage/matrix/matrix.pxd b/src/sage/matrix/matrix.pxd index f726ae5d8df..7899379dc45 100644 --- a/src/sage/matrix/matrix.pxd +++ b/src/sage/matrix/matrix.pxd @@ -1,2 +1,2 @@ # sage_setup: distribution = sagemath-modules -from .matrix2 cimport Matrix +from sage.matrix.matrix2 cimport Matrix diff --git a/src/sage/matrix/matrix1.pxd b/src/sage/matrix/matrix1.pxd index 10c7d08055d..72226127f27 100644 --- a/src/sage/matrix/matrix1.pxd +++ b/src/sage/matrix/matrix1.pxd @@ -1,5 +1,5 @@ # sage_setup: distribution = sagemath-modules -from .matrix0 cimport Matrix as Matrix0 +from sage.matrix.matrix0 cimport Matrix as Matrix0 cdef class Matrix(Matrix0): cdef _stack_impl(self, bottom) diff --git a/src/sage/matrix/matrix2.pxd b/src/sage/matrix/matrix2.pxd index a0d260bf3bc..dc1104dfdbe 100644 --- a/src/sage/matrix/matrix2.pxd +++ b/src/sage/matrix/matrix2.pxd @@ -13,7 +13,7 @@ Generic matrices # http://www.gnu.org/licenses/ #***************************************************************************** -from .matrix1 cimport Matrix as Matrix1 +from sage.matrix.matrix1 cimport Matrix as Matrix1 cdef class Matrix(Matrix1): cdef _det_by_minors(self, Py_ssize_t level) diff --git a/src/sage/matrix/matrix_complex_ball_dense.pxd b/src/sage/matrix/matrix_complex_ball_dense.pxd index bcedd07e4bf..497b9379a80 100644 --- a/src/sage/matrix/matrix_complex_ball_dense.pxd +++ b/src/sage/matrix/matrix_complex_ball_dense.pxd @@ -1,6 +1,6 @@ # sage_setup: distribution = sagemath-flint from sage.libs.arb.types cimport acb_mat_t -from .matrix_dense cimport Matrix_dense +from sage.matrix.matrix_dense cimport Matrix_dense from sage.matrix.matrix_generic_dense cimport Matrix_generic_dense from sage.structure.parent cimport Parent diff --git a/src/sage/matrix/matrix_complex_ball_dense.pyx b/src/sage/matrix/matrix_complex_ball_dense.pyx index e3e1e61d99c..967900faf2f 100644 --- a/src/sage/matrix/matrix_complex_ball_dense.pyx +++ b/src/sage/matrix/matrix_complex_ball_dense.pyx @@ -41,7 +41,7 @@ from sage.libs.arb.acb cimport * from sage.libs.arb.acb_mat cimport * from sage.libs.gmp.mpz cimport mpz_fits_ulong_p, mpz_get_ui from sage.matrix.constructor import matrix -from .args cimport SparseEntry, MatrixArgs_init +from sage.matrix.args cimport SparseEntry, MatrixArgs_init from sage.rings.complex_interval cimport ComplexIntervalFieldElement from sage.rings.complex_arb cimport ( ComplexBall, diff --git a/src/sage/matrix/matrix_complex_double_dense.pxd b/src/sage/matrix/matrix_complex_double_dense.pxd index 65fe50ae548..1626912bb9d 100644 --- a/src/sage/matrix/matrix_complex_double_dense.pxd +++ b/src/sage/matrix/matrix_complex_double_dense.pxd @@ -1,5 +1,5 @@ # sage_setup: distribution = sagemath-modules -from .matrix_double_dense cimport Matrix_double_dense +from sage.matrix.matrix_double_dense cimport Matrix_double_dense cdef class Matrix_complex_double_dense(Matrix_double_dense): pass diff --git a/src/sage/matrix/matrix_cyclo_dense.pxd b/src/sage/matrix/matrix_cyclo_dense.pxd index 4bbb862355e..13f72389cf5 100644 --- a/src/sage/matrix/matrix_cyclo_dense.pxd +++ b/src/sage/matrix/matrix_cyclo_dense.pxd @@ -1,6 +1,6 @@ from sage.libs.gmp.types cimport mpz_t -from .matrix_dense cimport Matrix_dense -from .matrix_rational_dense cimport Matrix_rational_dense +from sage.matrix.matrix_dense cimport Matrix_dense +from sage.matrix.matrix_rational_dense cimport Matrix_rational_dense cdef class Matrix_cyclo_dense(Matrix_dense): diff --git a/src/sage/matrix/matrix_cyclo_dense.pyx b/src/sage/matrix/matrix_cyclo_dense.pyx index f1ed9af8403..ed0b0f5f5d1 100644 --- a/src/sage/matrix/matrix_cyclo_dense.pyx +++ b/src/sage/matrix/matrix_cyclo_dense.pyx @@ -56,12 +56,12 @@ from sage.libs.flint.fmpz cimport fmpz_init, fmpz_clear, fmpz_set_mpz, fmpz_one, from sage.libs.flint.fmpq cimport fmpq_is_zero, fmpq_set_mpq, fmpq_canonicalise from sage.libs.flint.fmpq_mat cimport fmpq_mat_entry_num, fmpq_mat_entry_den, fmpq_mat_entry -from .args cimport MatrixArgs_init +from sage.matrix.args cimport MatrixArgs_init from .constructor import matrix from .matrix_space import MatrixSpace -from .matrix cimport Matrix +from sage.matrix.matrix cimport Matrix from . import matrix_dense -from .matrix_integer_dense cimport _lift_crt +from sage.matrix.matrix_integer_dense cimport _lift_crt from sage.structure.element cimport Matrix as baseMatrix from .misc_flint import matrix_integer_dense_rational_reconstruction diff --git a/src/sage/matrix/matrix_dense.pxd b/src/sage/matrix/matrix_dense.pxd index f190463fce5..b9e3b3bd7f5 100644 --- a/src/sage/matrix/matrix_dense.pxd +++ b/src/sage/matrix/matrix_dense.pxd @@ -1,5 +1,5 @@ # sage_setup: distribution = sagemath-modules -from .matrix cimport Matrix +from sage.matrix.matrix cimport Matrix cdef class Matrix_dense(Matrix): cdef void set_unsafe_int(self, Py_ssize_t i, Py_ssize_t j, int value) diff --git a/src/sage/matrix/matrix_domain_dense.pxd b/src/sage/matrix/matrix_domain_dense.pxd index 6ea87d4391d..f924ac01457 100644 --- a/src/sage/matrix/matrix_domain_dense.pxd +++ b/src/sage/matrix/matrix_domain_dense.pxd @@ -1,5 +1,5 @@ # sage_setup: distribution = sagemath-modules -from .matrix cimport Matrix +from sage.matrix.matrix cimport Matrix cdef class Matrix_domain_dense(Matrix): pass diff --git a/src/sage/matrix/matrix_domain_sparse.pxd b/src/sage/matrix/matrix_domain_sparse.pxd index 58a81946669..2c95dd4f418 100644 --- a/src/sage/matrix/matrix_domain_sparse.pxd +++ b/src/sage/matrix/matrix_domain_sparse.pxd @@ -1,5 +1,5 @@ # sage_setup: distribution = sagemath-modules -from .matrix cimport Matrix +from sage.matrix.matrix cimport Matrix cdef class Matrix_domain_sparse(Matrix): pass diff --git a/src/sage/matrix/matrix_double_dense.pxd b/src/sage/matrix/matrix_double_dense.pxd index eb3b811545c..ac4ee7ce6b7 100644 --- a/src/sage/matrix/matrix_double_dense.pxd +++ b/src/sage/matrix/matrix_double_dense.pxd @@ -1,5 +1,5 @@ # sage_setup: distribution = sagemath-modules -from .matrix_numpy_dense cimport Matrix_numpy_dense +from sage.matrix.matrix_numpy_dense cimport Matrix_numpy_dense cdef class Matrix_double_dense(Matrix_numpy_dense): diff --git a/src/sage/matrix/matrix_double_sparse.pxd b/src/sage/matrix/matrix_double_sparse.pxd index d5b47855d7d..5518aae771a 100644 --- a/src/sage/matrix/matrix_double_sparse.pxd +++ b/src/sage/matrix/matrix_double_sparse.pxd @@ -1,5 +1,5 @@ # sage_setup: distribution = sagemath-modules -from .matrix_generic_sparse cimport Matrix_generic_sparse +from sage.matrix.matrix_generic_sparse cimport Matrix_generic_sparse cdef class Matrix_double_sparse(Matrix_generic_sparse): pass diff --git a/src/sage/matrix/matrix_double_sparse.pyx b/src/sage/matrix/matrix_double_sparse.pyx index 387597d21ab..35e0546b3cb 100644 --- a/src/sage/matrix/matrix_double_sparse.pyx +++ b/src/sage/matrix/matrix_double_sparse.pyx @@ -1,6 +1,6 @@ # sage_setup: distribution = sagemath-modules -from .matrix2 cimport Matrix -from .matrix_generic_sparse cimport Matrix_generic_sparse +from sage.matrix.matrix2 cimport Matrix +from sage.matrix.matrix_generic_sparse cimport Matrix_generic_sparse cdef class Matrix_double_sparse(Matrix_generic_sparse): r""" diff --git a/src/sage/matrix/matrix_gap.pxd b/src/sage/matrix/matrix_gap.pxd index b015ebe3fdb..71497a3d834 100644 --- a/src/sage/matrix/matrix_gap.pxd +++ b/src/sage/matrix/matrix_gap.pxd @@ -1,5 +1,5 @@ # sage_setup: distribution = sagemath-gap -from .matrix_dense cimport Matrix_dense +from sage.matrix.matrix_dense cimport Matrix_dense from sage.libs.gap.element cimport GapElement cdef class Matrix_gap(Matrix_dense): diff --git a/src/sage/matrix/matrix_gap.pyx b/src/sage/matrix/matrix_gap.pyx index 285b63a6dd3..09af01a5518 100644 --- a/src/sage/matrix/matrix_gap.pyx +++ b/src/sage/matrix/matrix_gap.pyx @@ -14,7 +14,7 @@ Wrappers on GAP matrices from sage.libs.gap.libgap import libgap from sage.structure.element cimport Matrix -from .args cimport MatrixArgs_init +from sage.matrix.args cimport MatrixArgs_init cdef class Matrix_gap(Matrix_dense): diff --git a/src/sage/matrix/matrix_generic_dense.pxd b/src/sage/matrix/matrix_generic_dense.pxd index d0479c56f03..270eccd924f 100644 --- a/src/sage/matrix/matrix_generic_dense.pxd +++ b/src/sage/matrix/matrix_generic_dense.pxd @@ -1,5 +1,5 @@ # sage_setup: distribution = sagemath-modules -from .matrix_dense cimport Matrix_dense +from sage.matrix.matrix_dense cimport Matrix_dense cdef class Matrix_generic_dense(Matrix_dense): cdef list _entries diff --git a/src/sage/matrix/matrix_generic_dense.pyx b/src/sage/matrix/matrix_generic_dense.pyx index 10a12123079..6761d13ccba 100644 --- a/src/sage/matrix/matrix_generic_dense.pyx +++ b/src/sage/matrix/matrix_generic_dense.pyx @@ -10,7 +10,7 @@ from cpython.ref cimport * cimport sage.matrix.matrix_dense as matrix_dense from . import matrix_dense -from .args cimport MatrixArgs_init +from sage.matrix.args cimport MatrixArgs_init cimport sage.matrix.matrix as matrix diff --git a/src/sage/matrix/matrix_generic_sparse.pxd b/src/sage/matrix/matrix_generic_sparse.pxd index 2e3d770dcce..a1d67eb0e26 100644 --- a/src/sage/matrix/matrix_generic_sparse.pxd +++ b/src/sage/matrix/matrix_generic_sparse.pxd @@ -1,5 +1,5 @@ # sage_setup: distribution = sagemath-modules -from .matrix_sparse cimport Matrix_sparse +from sage.matrix.matrix_sparse cimport Matrix_sparse cdef class Matrix_generic_sparse(Matrix_sparse): cdef dict _entries diff --git a/src/sage/matrix/matrix_generic_sparse.pyx b/src/sage/matrix/matrix_generic_sparse.pyx index ca620102955..4344dd5f22c 100644 --- a/src/sage/matrix/matrix_generic_sparse.pyx +++ b/src/sage/matrix/matrix_generic_sparse.pyx @@ -57,7 +57,7 @@ EXAMPLES:: """ cimport sage.matrix.matrix_sparse as matrix_sparse cimport sage.structure.element -from .args cimport MatrixArgs_init +from sage.matrix.args cimport MatrixArgs_init cdef class Matrix_generic_sparse(matrix_sparse.Matrix_sparse): diff --git a/src/sage/matrix/matrix_gf2e_dense.pxd b/src/sage/matrix/matrix_gf2e_dense.pxd index cca40034d84..9357616496b 100644 --- a/src/sage/matrix/matrix_gf2e_dense.pxd +++ b/src/sage/matrix/matrix_gf2e_dense.pxd @@ -1,7 +1,7 @@ # sage_setup: distribution = sagemath-linbox from sage.libs.m4rie cimport mzed_t from sage.libs.m4ri cimport m4ri_word -from .matrix_dense cimport Matrix_dense +from sage.matrix.matrix_dense cimport Matrix_dense cdef class Matrix_gf2e_dense(Matrix_dense): diff --git a/src/sage/matrix/matrix_gf2e_dense.pyx b/src/sage/matrix/matrix_gf2e_dense.pyx index 42dd8dcdc24..33d9266cec0 100644 --- a/src/sage/matrix/matrix_gf2e_dense.pyx +++ b/src/sage/matrix/matrix_gf2e_dense.pyx @@ -96,7 +96,7 @@ from sage.rings.finite_rings.finite_field_constructor import FiniteField as GF from sage.misc.randstate cimport randstate, current_randstate from sage.matrix.matrix_mod2_dense cimport Matrix_mod2_dense -from .args cimport SparseEntry, MatrixArgs_init +from sage.matrix.args cimport SparseEntry, MatrixArgs_init from sage.libs.m4ri cimport m4ri_word, mzd_copy from sage.libs.m4rie cimport * diff --git a/src/sage/matrix/matrix_gfpn_dense.pyx b/src/sage/matrix/matrix_gfpn_dense.pyx index abd0754db48..5262b323c3c 100644 --- a/src/sage/matrix/matrix_gfpn_dense.pyx +++ b/src/sage/matrix/matrix_gfpn_dense.pyx @@ -55,7 +55,7 @@ from sage.misc.randstate import current_randstate from sage.misc.randstate cimport randstate from sage.structure.element cimport Element, Matrix from sage.structure.richcmp import rich_to_bool -from .args cimport MatrixArgs_init +from sage.matrix.args cimport MatrixArgs_init from libc.string cimport memset, memcpy diff --git a/src/sage/matrix/matrix_integer_dense.pxd b/src/sage/matrix/matrix_integer_dense.pxd index 9578db6b0d8..f8c32a7aa5b 100644 --- a/src/sage/matrix/matrix_integer_dense.pxd +++ b/src/sage/matrix/matrix_integer_dense.pxd @@ -2,7 +2,7 @@ from sage.libs.gmp.types cimport * from sage.libs.flint.types cimport fmpz_mat_t -from .matrix_dense cimport Matrix_dense +from sage.matrix.matrix_dense cimport Matrix_dense from sage.rings.integer cimport Integer from sage.ext.mod_int cimport * diff --git a/src/sage/matrix/matrix_integer_dense.pyx b/src/sage/matrix/matrix_integer_dense.pyx index 1a69477d29e..b70f7cb520e 100644 --- a/src/sage/matrix/matrix_integer_dense.pyx +++ b/src/sage/matrix/matrix_integer_dense.pyx @@ -87,7 +87,7 @@ from sage.structure.proof.proof import get_flag as get_proof_flag from sage.structure.richcmp cimport rich_to_bool from sage.misc.randstate cimport randstate, current_randstate -from .args cimport SparseEntry, MatrixArgs_init +from sage.matrix.args cimport SparseEntry, MatrixArgs_init ######################################################### # PARI C library @@ -115,18 +115,18 @@ from sage.rings.polynomial.polynomial_integer_dense_flint cimport Polynomial_int from sage.structure.element cimport Element, Vector from sage.structure.element import is_Vector -from .matrix_modn_dense_float cimport Matrix_modn_dense_template -from .matrix_modn_dense_float cimport Matrix_modn_dense_float -from .matrix_modn_dense_double cimport Matrix_modn_dense_double +from sage.matrix.matrix_modn_dense_float cimport Matrix_modn_dense_template +from sage.matrix.matrix_modn_dense_float cimport Matrix_modn_dense_float +from sage.matrix.matrix_modn_dense_double cimport Matrix_modn_dense_double from .matrix_mod2_dense import Matrix_mod2_dense -from .matrix_mod2_dense cimport Matrix_mod2_dense +from sage.matrix.matrix_mod2_dense cimport Matrix_mod2_dense from sage.rings.finite_rings.finite_field_constructor import GF from .matrix2 import decomp_seq -from .matrix cimport Matrix +from sage.matrix.matrix cimport Matrix cimport sage.structure.element diff --git a/src/sage/matrix/matrix_integer_sparse.pxd b/src/sage/matrix/matrix_integer_sparse.pxd index 63ba073d8ec..6d2ad42805e 100644 --- a/src/sage/matrix/matrix_integer_sparse.pxd +++ b/src/sage/matrix/matrix_integer_sparse.pxd @@ -1,7 +1,7 @@ # sage_setup: distribution = sagemath-flint from sage.modules.vector_integer_sparse cimport mpz_vector from sage.ext.mod_int cimport mod_int -from .matrix_sparse cimport Matrix_sparse +from sage.matrix.matrix_sparse cimport Matrix_sparse cdef class Matrix_integer_sparse(Matrix_sparse): cdef mpz_vector* _matrix diff --git a/src/sage/matrix/matrix_integer_sparse.pyx b/src/sage/matrix/matrix_integer_sparse.pyx index 1fb610515af..62c2c4f18e9 100644 --- a/src/sage/matrix/matrix_integer_sparse.pyx +++ b/src/sage/matrix/matrix_integer_sparse.pyx @@ -54,15 +54,15 @@ from sage.libs.gmp.mpz cimport * from sage.rings.integer cimport Integer from sage.rings.polynomial.polynomial_integer_dense_flint cimport Polynomial_integer_dense_flint -from .matrix cimport Matrix +from sage.matrix.matrix cimport Matrix -from .args cimport SparseEntry, MatrixArgs_init -from .matrix_integer_dense cimport Matrix_integer_dense +from sage.matrix.args cimport SparseEntry, MatrixArgs_init +from sage.matrix.matrix_integer_dense cimport Matrix_integer_dense from sage.libs.flint.fmpz cimport fmpz_set_mpz, fmpz_get_mpz from sage.libs.flint.fmpz_poly cimport fmpz_poly_fit_length, fmpz_poly_set_coeff_mpz, _fmpz_poly_set_length from sage.libs.flint.fmpz_mat cimport fmpz_mat_entry -from .matrix_modn_sparse cimport Matrix_modn_sparse +from sage.matrix.matrix_modn_sparse cimport Matrix_modn_sparse from sage.structure.element cimport Element import sage.matrix.matrix_space as matrix_space diff --git a/src/sage/matrix/matrix_mod2_dense.pyx b/src/sage/matrix/matrix_mod2_dense.pyx index 1a3a4901126..2fbe58f24f8 100644 --- a/src/sage/matrix/matrix_mod2_dense.pyx +++ b/src/sage/matrix/matrix_mod2_dense.pyx @@ -110,7 +110,7 @@ from cysignals.memory cimport check_malloc, sig_free from cysignals.signals cimport sig_on, sig_str, sig_off cimport sage.matrix.matrix_dense as matrix_dense -from .args cimport SparseEntry, MatrixArgs_init +from sage.matrix.args cimport SparseEntry, MatrixArgs_init from libc.stdio cimport * from sage.structure.element cimport (Matrix, Vector) from sage.modules.free_module_element cimport FreeModuleElement diff --git a/src/sage/matrix/matrix_modn_dense_template.pxi b/src/sage/matrix/matrix_modn_dense_template.pxi index 631536cf3a6..ac85369d251 100644 --- a/src/sage/matrix/matrix_modn_dense_template.pxi +++ b/src/sage/matrix/matrix_modn_dense_template.pxi @@ -124,7 +124,7 @@ from sage.structure.proof.proof import get_flag as get_proof_flag from sage.structure.richcmp cimport rich_to_bool from sage.misc.randstate cimport randstate, current_randstate import sage.matrix.matrix_space as matrix_space -from .args cimport SparseEntry, MatrixArgs_init +from sage.matrix.args cimport SparseEntry, MatrixArgs_init from sage.cpython.string cimport char_to_str diff --git a/src/sage/matrix/matrix_modn_sparse.pyx b/src/sage/matrix/matrix_modn_sparse.pyx index 8a0cd2eb708..936c0e30869 100644 --- a/src/sage/matrix/matrix_modn_sparse.pyx +++ b/src/sage/matrix/matrix_modn_sparse.pyx @@ -111,7 +111,7 @@ from sage.rings.integer_ring import ZZ from sage.misc.verbose import verbose, get_verbose from sage.matrix.matrix2 import Matrix as Matrix2 -from .args cimport SparseEntry, MatrixArgs_init +from sage.matrix.args cimport SparseEntry, MatrixArgs_init from sage.arith.misc import is_prime cimport sage.structure.element @@ -119,7 +119,7 @@ cimport sage.structure.element from sage.data_structures.binary_search cimport * from sage.modules.vector_integer_sparse cimport * -from .matrix_integer_dense cimport Matrix_integer_dense +from sage.matrix.matrix_integer_dense cimport Matrix_integer_dense from sage.modules.vector_integer_dense cimport Vector_integer_dense ################ diff --git a/src/sage/matrix/matrix_numpy_dense.pxd b/src/sage/matrix/matrix_numpy_dense.pxd index 6a373dbf8c9..1bdd89f8bfb 100644 --- a/src/sage/matrix/matrix_numpy_dense.pxd +++ b/src/sage/matrix/matrix_numpy_dense.pxd @@ -1,5 +1,5 @@ # sage_setup: distribution = sagemath-modules -from .matrix_dense cimport Matrix_dense +from sage.matrix.matrix_dense cimport Matrix_dense cimport numpy as cnumpy diff --git a/src/sage/matrix/matrix_numpy_dense.pyx b/src/sage/matrix/matrix_numpy_dense.pyx index f55ccf730ff..5c10f3cefe4 100644 --- a/src/sage/matrix/matrix_numpy_dense.pyx +++ b/src/sage/matrix/matrix_numpy_dense.pyx @@ -41,7 +41,7 @@ AUTHORS: # https://www.gnu.org/licenses/ # **************************************************************************** -from .args cimport MatrixArgs_init +from sage.matrix.args cimport MatrixArgs_init cimport sage.structure.element cimport numpy as cnumpy diff --git a/src/sage/matrix/matrix_numpy_integer_dense.pxd b/src/sage/matrix/matrix_numpy_integer_dense.pxd index 60347e80fe3..6d63f9808e4 100644 --- a/src/sage/matrix/matrix_numpy_integer_dense.pxd +++ b/src/sage/matrix/matrix_numpy_integer_dense.pxd @@ -1,5 +1,5 @@ # sage_setup: distribution = sagemath-modules -from .matrix_numpy_dense cimport Matrix_numpy_dense +from sage.matrix.matrix_numpy_dense cimport Matrix_numpy_dense cdef class Matrix_numpy_integer_dense(Matrix_numpy_dense): diff --git a/src/sage/matrix/matrix_rational_dense.pxd b/src/sage/matrix/matrix_rational_dense.pxd index 17ed87f46a5..0f196e53f9e 100644 --- a/src/sage/matrix/matrix_rational_dense.pxd +++ b/src/sage/matrix/matrix_rational_dense.pxd @@ -1,6 +1,6 @@ # sage_setup: distribution = sagemath-flint from sage.libs.flint.types cimport fmpz_t, fmpq_mat_t -from .matrix_dense cimport Matrix_dense +from sage.matrix.matrix_dense cimport Matrix_dense cdef class Matrix_rational_dense(Matrix_dense): cdef fmpq_mat_t _matrix diff --git a/src/sage/matrix/matrix_rational_dense.pyx b/src/sage/matrix/matrix_rational_dense.pyx index 8a64a3160a6..18525e78822 100644 --- a/src/sage/matrix/matrix_rational_dense.pyx +++ b/src/sage/matrix/matrix_rational_dense.pyx @@ -105,9 +105,9 @@ cimport sage.structure.element from sage.structure.richcmp cimport rich_to_bool from sage.rings.rational cimport Rational -from .matrix cimport Matrix -from .args cimport SparseEntry, MatrixArgs_init -from .matrix_integer_dense cimport Matrix_integer_dense, _lift_crt +from sage.matrix.matrix cimport Matrix +from sage.matrix.args cimport SparseEntry, MatrixArgs_init +from sage.matrix.matrix_integer_dense cimport Matrix_integer_dense, _lift_crt from sage.structure.element cimport Element, Vector from sage.rings.integer cimport Integer from sage.rings.ring import is_Ring diff --git a/src/sage/matrix/matrix_rational_sparse.pxd b/src/sage/matrix/matrix_rational_sparse.pxd index 3607e460e90..e6753ac0f4d 100644 --- a/src/sage/matrix/matrix_rational_sparse.pxd +++ b/src/sage/matrix/matrix_rational_sparse.pxd @@ -1,7 +1,7 @@ # sage_setup: distribution = sagemath-flint from sage.libs.gmp.types cimport mpz_t from sage.modules.vector_rational_sparse cimport mpq_vector -from .matrix_sparse cimport Matrix_sparse +from sage.matrix.matrix_sparse cimport Matrix_sparse cdef class Matrix_rational_sparse(Matrix_sparse): diff --git a/src/sage/matrix/matrix_rational_sparse.pyx b/src/sage/matrix/matrix_rational_sparse.pyx index e1bb904949d..9009b3a8200 100644 --- a/src/sage/matrix/matrix_rational_sparse.pyx +++ b/src/sage/matrix/matrix_rational_sparse.pyx @@ -35,8 +35,8 @@ from cpython.sequence cimport * from sage.rings.rational cimport Rational from sage.rings.integer cimport Integer -from .matrix cimport Matrix -from .args cimport SparseEntry, MatrixArgs_init +from sage.matrix.matrix cimport Matrix +from sage.matrix.args cimport SparseEntry, MatrixArgs_init from sage.libs.gmp.mpz cimport * from sage.libs.gmp.mpq cimport * @@ -51,8 +51,8 @@ cimport sage.structure.element import sage.matrix.matrix_space -from .matrix_integer_sparse cimport Matrix_integer_sparse -from .matrix_rational_dense cimport Matrix_rational_dense +from sage.matrix.matrix_integer_sparse cimport Matrix_integer_sparse +from sage.matrix.matrix_rational_dense cimport Matrix_rational_dense cdef class Matrix_rational_sparse(Matrix_sparse): diff --git a/src/sage/matrix/matrix_real_double_dense.pxd b/src/sage/matrix/matrix_real_double_dense.pxd index aa566976454..f4525b18715 100644 --- a/src/sage/matrix/matrix_real_double_dense.pxd +++ b/src/sage/matrix/matrix_real_double_dense.pxd @@ -1,5 +1,5 @@ # sage_setup: distribution = sagemath-modules -from .matrix_double_dense cimport Matrix_double_dense +from sage.matrix.matrix_double_dense cimport Matrix_double_dense cdef class Matrix_real_double_dense(Matrix_double_dense): cdef set_unsafe_double(self, Py_ssize_t i, Py_ssize_t j, double value) diff --git a/src/sage/matrix/matrix_symbolic_dense.pxd b/src/sage/matrix/matrix_symbolic_dense.pxd index 0c7f6857946..951e48c69f5 100644 --- a/src/sage/matrix/matrix_symbolic_dense.pxd +++ b/src/sage/matrix/matrix_symbolic_dense.pxd @@ -1,5 +1,5 @@ # sage_setup: distribution = sagemath-symbolics -from .matrix_generic_dense cimport Matrix_generic_dense +from sage.matrix.matrix_generic_dense cimport Matrix_generic_dense cdef class Matrix_symbolic_dense(Matrix_generic_dense): pass diff --git a/src/sage/matrix/matrix_symbolic_dense.pyx b/src/sage/matrix/matrix_symbolic_dense.pyx index 83a49b2dc94..0476224e859 100644 --- a/src/sage/matrix/matrix_symbolic_dense.pyx +++ b/src/sage/matrix/matrix_symbolic_dense.pyx @@ -158,7 +158,7 @@ Check that :trac:`12778` is fixed:: from sage.rings.polynomial.polynomial_ring_constructor import PolynomialRing from sage.structure.factorization import Factorization -from .matrix_generic_dense cimport Matrix_generic_dense +from sage.matrix.matrix_generic_dense cimport Matrix_generic_dense from .constructor import matrix cdef maxima diff --git a/src/sage/matrix/matrix_symbolic_sparse.pxd b/src/sage/matrix/matrix_symbolic_sparse.pxd index 18d64f3682d..e1079398588 100644 --- a/src/sage/matrix/matrix_symbolic_sparse.pxd +++ b/src/sage/matrix/matrix_symbolic_sparse.pxd @@ -1,5 +1,5 @@ # sage_setup: distribution = sagemath-symbolics -from .matrix_generic_sparse cimport Matrix_generic_sparse +from sage.matrix.matrix_generic_sparse cimport Matrix_generic_sparse cdef class Matrix_symbolic_sparse(Matrix_generic_sparse): pass diff --git a/src/sage/matrix/matrix_symbolic_sparse.pyx b/src/sage/matrix/matrix_symbolic_sparse.pyx index bd01b5d63fd..d763a0c3d99 100644 --- a/src/sage/matrix/matrix_symbolic_sparse.pyx +++ b/src/sage/matrix/matrix_symbolic_sparse.pyx @@ -166,7 +166,7 @@ Check that :issue:`35653` is fixed:: from sage.rings.polynomial.polynomial_ring_constructor import PolynomialRing from sage.structure.factorization import Factorization -from .matrix_generic_sparse cimport Matrix_generic_sparse +from sage.matrix.matrix_generic_sparse cimport Matrix_generic_sparse from .constructor import matrix cdef maxima diff --git a/src/sage/matrix/matrix_window.pxd b/src/sage/matrix/matrix_window.pxd index 14f095d534e..c9779fee553 100644 --- a/src/sage/matrix/matrix_window.pxd +++ b/src/sage/matrix/matrix_window.pxd @@ -1,5 +1,5 @@ # sage_setup: distribution = sagemath-modules -from .matrix cimport Matrix +from sage.matrix.matrix cimport Matrix cdef class MatrixWindow: cdef Py_ssize_t _row, _col, _nrows, _ncols diff --git a/src/sage/matrix/misc.pyx b/src/sage/matrix/misc.pyx index 1819d45591e..9a51efc1038 100644 --- a/src/sage/matrix/misc.pyx +++ b/src/sage/matrix/misc.pyx @@ -18,9 +18,9 @@ from sage.modules.vector_rational_sparse cimport * from sage.rings.integer cimport Integer from sage.rings.rational_field import QQ -from .matrix0 cimport Matrix -from .matrix_integer_sparse cimport Matrix_integer_sparse -from .matrix_rational_sparse cimport Matrix_rational_sparse +from sage.matrix.matrix0 cimport Matrix +from sage.matrix.matrix_integer_sparse cimport Matrix_integer_sparse +from sage.matrix.matrix_rational_sparse cimport Matrix_rational_sparse matrix_integer_dense_rational_reconstruction = \ LazyImport('sage.matrix.misc_flint', 'matrix_integer_dense_rational_reconstruction', diff --git a/src/sage/matrix/misc_flint.pyx b/src/sage/matrix/misc_flint.pyx index 0316c617d8d..69c2add9c51 100644 --- a/src/sage/matrix/misc_flint.pyx +++ b/src/sage/matrix/misc_flint.pyx @@ -14,8 +14,8 @@ from sage.libs.flint.fmpz cimport fmpz_set_mpz, fmpz_one from sage.rings.integer cimport Integer from sage.rings.rational_field import QQ -from .matrix_integer_dense cimport Matrix_integer_dense -from .matrix_rational_dense cimport Matrix_rational_dense +from sage.matrix.matrix_integer_dense cimport Matrix_integer_dense +from sage.matrix.matrix_rational_dense cimport Matrix_rational_dense def matrix_integer_dense_rational_reconstruction(Matrix_integer_dense A, Integer N): diff --git a/src/sage/matrix/misc_mpfr.pyx b/src/sage/matrix/misc_mpfr.pyx index 7ff9ac13f45..9e9905c6b47 100644 --- a/src/sage/matrix/misc_mpfr.pyx +++ b/src/sage/matrix/misc_mpfr.pyx @@ -10,7 +10,7 @@ cimport sage.rings.abc from sage.libs.mpfr cimport * from sage.rings.real_mpfr cimport RealNumber -from .matrix0 cimport Matrix +from sage.matrix.matrix0 cimport Matrix def hadamard_row_bound_mpfr(Matrix A): diff --git a/src/sage/matrix/strassen.pyx b/src/sage/matrix/strassen.pyx index 1ff9d4cb3ff..2944280af94 100644 --- a/src/sage/matrix/strassen.pyx +++ b/src/sage/matrix/strassen.pyx @@ -16,7 +16,7 @@ multiplication algorithms. # http://www.gnu.org/licenses/ #***************************************************************************** -from .matrix_window cimport MatrixWindow +from sage.matrix.matrix_window cimport MatrixWindow from cysignals.signals cimport sig_on, sig_off diff --git a/src/sage/matrix/template.pxd b/src/sage/matrix/template.pxd index ff65aeb8e27..b8cd9f753e3 100644 --- a/src/sage/matrix/template.pxd +++ b/src/sage/matrix/template.pxd @@ -1,5 +1,5 @@ # sage_setup: distribution = sagemath-modules -from .matrix_dense cimport Matrix_dense +from sage.matrix.matrix_dense cimport Matrix_dense cdef class Matrix_generic_dense(Matrix_dense): pass diff --git a/src/sage/matroids/basis_exchange_matroid.pxd b/src/sage/matroids/basis_exchange_matroid.pxd index 81710ef2484..2c24f2879aa 100644 --- a/src/sage/matroids/basis_exchange_matroid.pxd +++ b/src/sage/matroids/basis_exchange_matroid.pxd @@ -2,8 +2,8 @@ from sage.data_structures.bitset cimport * from sage.data_structures.bitset_base cimport bitset_t, bitset_s -from .matroid cimport Matroid -from .set_system cimport SetSystem +from sage.matroids.matroid cimport Matroid +from sage.matroids.set_system cimport SetSystem cdef class BasisExchangeMatroid(Matroid): cdef long _groundset_size, _matroid_rank, _bitset_size diff --git a/src/sage/matroids/basis_exchange_matroid.pyx b/src/sage/matroids/basis_exchange_matroid.pyx index 488ce0f92ae..0439a684320 100644 --- a/src/sage/matroids/basis_exchange_matroid.pyx +++ b/src/sage/matroids/basis_exchange_matroid.pyx @@ -39,8 +39,8 @@ Methods # https://www.gnu.org/licenses/ # **************************************************************************** -from .matroid cimport Matroid -from .set_system cimport SetSystem +from sage.matroids.matroid cimport Matroid +from sage.matroids.set_system cimport SetSystem from sage.data_structures.bitset_base cimport * diff --git a/src/sage/matroids/basis_matroid.pxd b/src/sage/matroids/basis_matroid.pxd index 51d4e8e8282..d301af4e3eb 100644 --- a/src/sage/matroids/basis_matroid.pxd +++ b/src/sage/matroids/basis_matroid.pxd @@ -1,8 +1,8 @@ # sage_setup: distribution = sagemath-modules from sage.data_structures.bitset cimport bitset_t -from .matroid cimport Matroid -from .basis_exchange_matroid cimport BasisExchangeMatroid -from .set_system cimport SetSystem +from sage.matroids.matroid cimport Matroid +from sage.matroids.basis_exchange_matroid cimport BasisExchangeMatroid +from sage.matroids.set_system cimport SetSystem cdef class BasisMatroid(BasisExchangeMatroid): cdef bitset_t _bb diff --git a/src/sage/matroids/basis_matroid.pyx b/src/sage/matroids/basis_matroid.pyx index 72ae16cd891..d2e7e8cdebb 100644 --- a/src/sage/matroids/basis_matroid.pyx +++ b/src/sage/matroids/basis_matroid.pyx @@ -75,9 +75,9 @@ Methods from sage.data_structures.bitset_base cimport * from sage.structure.richcmp cimport rich_to_bool -from .matroid cimport Matroid -from .basis_exchange_matroid cimport BasisExchangeMatroid -from .set_system cimport SetSystem +from sage.matroids.matroid cimport Matroid +from sage.matroids.basis_exchange_matroid cimport BasisExchangeMatroid +from sage.matroids.set_system cimport SetSystem from cpython.object cimport Py_EQ, Py_NE from itertools import combinations diff --git a/src/sage/matroids/circuit_closures_matroid.pxd b/src/sage/matroids/circuit_closures_matroid.pxd index 646a5e159e9..d6cf8230701 100644 --- a/src/sage/matroids/circuit_closures_matroid.pxd +++ b/src/sage/matroids/circuit_closures_matroid.pxd @@ -1,5 +1,5 @@ # sage_setup: distribution = sagemath-modules -from .matroid cimport Matroid +from sage.matroids.matroid cimport Matroid cdef class CircuitClosuresMatroid(Matroid): cdef frozenset _groundset # _E diff --git a/src/sage/matroids/circuit_closures_matroid.pyx b/src/sage/matroids/circuit_closures_matroid.pyx index f979602b00a..eb0fd1ff06b 100644 --- a/src/sage/matroids/circuit_closures_matroid.pyx +++ b/src/sage/matroids/circuit_closures_matroid.pyx @@ -68,8 +68,8 @@ Methods # **************************************************************************** from sage.structure.richcmp cimport rich_to_bool, richcmp -from .matroid cimport Matroid -from .set_system cimport SetSystem +from sage.matroids.matroid cimport Matroid +from sage.matroids.set_system cimport SetSystem from .utilities import setprint_s from cpython.object cimport Py_EQ, Py_NE diff --git a/src/sage/matroids/extension.pxd b/src/sage/matroids/extension.pxd index 398389d1f41..bc7419b2446 100644 --- a/src/sage/matroids/extension.pxd +++ b/src/sage/matroids/extension.pxd @@ -1,6 +1,6 @@ # sage_setup: distribution = sagemath-modules from sage.data_structures.bitset cimport bitset_t -from .basis_matroid cimport BasisMatroid +from sage.matroids.basis_matroid cimport BasisMatroid cdef class CutNode: cdef LinearSubclasses _MC diff --git a/src/sage/matroids/extension.pyx b/src/sage/matroids/extension.pyx index 33a76fd8b23..d033e713efa 100644 --- a/src/sage/matroids/extension.pyx +++ b/src/sage/matroids/extension.pyx @@ -31,7 +31,7 @@ Methods # **************************************************************************** from sage.data_structures.bitset_base cimport * -from .basis_matroid cimport BasisMatroid +from sage.matroids.basis_matroid cimport BasisMatroid cdef class CutNode: diff --git a/src/sage/matroids/linear_matroid.pxd b/src/sage/matroids/linear_matroid.pxd index f672998fa8e..722d5fdb9c8 100644 --- a/src/sage/matroids/linear_matroid.pxd +++ b/src/sage/matroids/linear_matroid.pxd @@ -1,9 +1,9 @@ # sage_setup: distribution = sagemath-modules from sage.data_structures.bitset cimport bitset_t -from .matroid cimport Matroid -from .basis_exchange_matroid cimport BasisExchangeMatroid -from .lean_matrix cimport LeanMatrix, GenericMatrix, BinaryMatrix, TernaryMatrix, QuaternaryMatrix +from sage.matroids.matroid cimport Matroid +from sage.matroids.basis_exchange_matroid cimport BasisExchangeMatroid +from sage.matroids.lean_matrix cimport LeanMatrix, GenericMatrix, BinaryMatrix, TernaryMatrix, QuaternaryMatrix cdef class LinearMatroid(BasisExchangeMatroid): diff --git a/src/sage/matroids/matroid.pyx b/src/sage/matroids/matroid.pyx index c9c21bada49..ba13e60eb49 100644 --- a/src/sage/matroids/matroid.pyx +++ b/src/sage/matroids/matroid.pyx @@ -344,8 +344,8 @@ from sage.structure.sage_object cimport SageObject MixedIntegerLinearProgram = LazyImport('sage.numerical.mip', 'MixedIntegerLinearProgram') -from .lean_matrix cimport BinaryMatrix, TernaryMatrix -from .set_system cimport SetSystem +from sage.matroids.lean_matrix cimport BinaryMatrix, TernaryMatrix +from sage.matroids.set_system cimport SetSystem from .utilities import newlabel, sanitize_contractions_deletions, spanning_forest, spanning_stars diff --git a/src/sage/matroids/union_matroid.pxd b/src/sage/matroids/union_matroid.pxd index 6f07d68ed47..ef07fc76ef3 100644 --- a/src/sage/matroids/union_matroid.pxd +++ b/src/sage/matroids/union_matroid.pxd @@ -1,5 +1,5 @@ # sage_setup: distribution = sagemath-modules -from .matroid cimport Matroid +from sage.matroids.matroid cimport Matroid cdef class MatroidUnion(Matroid): cdef list matroids diff --git a/src/sage/matroids/union_matroid.pyx b/src/sage/matroids/union_matroid.pyx index b90860037ee..0d66785e56c 100644 --- a/src/sage/matroids/union_matroid.pyx +++ b/src/sage/matroids/union_matroid.pyx @@ -1,6 +1,6 @@ # sage_setup: distribution = sagemath-modules -from .matroid cimport Matroid +from sage.matroids.matroid cimport Matroid cdef class MatroidUnion(Matroid): diff --git a/src/sage/matroids/unpickling.pyx b/src/sage/matroids/unpickling.pyx index 0400f57da73..89eadd4b59c 100644 --- a/src/sage/matroids/unpickling.pyx +++ b/src/sage/matroids/unpickling.pyx @@ -31,10 +31,10 @@ import sage.matroids.matroid import sage.matroids.basis_exchange_matroid from .minor_matroid import MinorMatroid from .dual_matroid import DualMatroid -from .circuit_closures_matroid cimport CircuitClosuresMatroid -from .basis_matroid cimport BasisMatroid -from .linear_matroid cimport LinearMatroid, RegularMatroid, BinaryMatroid, TernaryMatroid, QuaternaryMatroid -from .lean_matrix cimport GenericMatrix, BinaryMatrix, TernaryMatrix, QuaternaryMatrix, PlusMinusOneMatrix, RationalMatrix +from sage.matroids.circuit_closures_matroid cimport CircuitClosuresMatroid +from sage.matroids.basis_matroid cimport BasisMatroid +from sage.matroids.linear_matroid cimport LinearMatroid, RegularMatroid, BinaryMatroid, TernaryMatroid, QuaternaryMatroid +from sage.matroids.lean_matrix cimport GenericMatrix, BinaryMatrix, TernaryMatrix, QuaternaryMatrix, PlusMinusOneMatrix, RationalMatrix from .graphic_matroid import GraphicMatroid from sage.rings.rational cimport Rational diff --git a/src/sage/misc/cachefunc.pxd b/src/sage/misc/cachefunc.pxd index 96b6e70434f..a08889f22cb 100644 --- a/src/sage/misc/cachefunc.pxd +++ b/src/sage/misc/cachefunc.pxd @@ -1,5 +1,5 @@ # sage_setup: distribution = sagemath-objects -from .function_mangling cimport ArgumentFixer +from sage.misc.function_mangling cimport ArgumentFixer cpdef dict_key(o) cpdef cache_key(o) diff --git a/src/sage/modular/modsym/heilbronn.pyx b/src/sage/modular/modsym/heilbronn.pyx index 45f0921034d..0ac5626ee14 100644 --- a/src/sage/modular/modsym/heilbronn.pyx +++ b/src/sage/modular/modsym/heilbronn.pyx @@ -38,7 +38,7 @@ from . import p1list cdef p1list.export export export = p1list.export() -from .apply cimport Apply +from sage.modular.modsym.apply cimport Apply cdef Apply PolyApply= Apply() from sage.matrix.matrix_rational_dense cimport Matrix_rational_dense diff --git a/src/sage/modules/vector_complex_double_dense.pxd b/src/sage/modules/vector_complex_double_dense.pxd index e0153063eff..c5d53919535 100644 --- a/src/sage/modules/vector_complex_double_dense.pxd +++ b/src/sage/modules/vector_complex_double_dense.pxd @@ -1,5 +1,5 @@ # sage_setup: distribution = sagemath-modules -from .vector_double_dense cimport Vector_double_dense +from sage.modules.vector_double_dense cimport Vector_double_dense cdef class Vector_complex_double_dense(Vector_double_dense): pass diff --git a/src/sage/modules/vector_double_dense.pxd b/src/sage/modules/vector_double_dense.pxd index d8c66b84fb4..cb360bdc19a 100644 --- a/src/sage/modules/vector_double_dense.pxd +++ b/src/sage/modules/vector_double_dense.pxd @@ -1,5 +1,5 @@ # sage_setup: distribution = sagemath-modules -from .vector_numpy_dense cimport Vector_numpy_dense +from sage.modules.vector_numpy_dense cimport Vector_numpy_dense cdef class Vector_double_dense(Vector_numpy_dense): pass diff --git a/src/sage/modules/vector_integer_dense.pxd b/src/sage/modules/vector_integer_dense.pxd index 39bd7e47330..8fb7cad5e41 100644 --- a/src/sage/modules/vector_integer_dense.pxd +++ b/src/sage/modules/vector_integer_dense.pxd @@ -1,5 +1,5 @@ # sage_setup: distribution = sagemath-modules -from .free_module_element cimport FreeModuleElement +from sage.modules.free_module_element cimport FreeModuleElement from sage.libs.gmp.types cimport mpz_t from sage.structure.parent cimport Parent diff --git a/src/sage/modules/vector_modn_dense.pxd b/src/sage/modules/vector_modn_dense.pxd index 092b5bdb512..97ea939b70a 100644 --- a/src/sage/modules/vector_modn_dense.pxd +++ b/src/sage/modules/vector_modn_dense.pxd @@ -1,5 +1,5 @@ # sage_setup: distribution = sagemath-modules -from .free_module_element cimport FreeModuleElement +from sage.modules.free_module_element cimport FreeModuleElement from sage.ext.mod_int cimport mod_int cdef class Vector_modn_dense(FreeModuleElement): diff --git a/src/sage/modules/vector_numpy_dense.pxd b/src/sage/modules/vector_numpy_dense.pxd index 93c89c2b54d..93366ba45e8 100644 --- a/src/sage/modules/vector_numpy_dense.pxd +++ b/src/sage/modules/vector_numpy_dense.pxd @@ -1,5 +1,5 @@ # sage_setup: distribution = sagemath-modules -from .free_module_element cimport FreeModuleElement +from sage.modules.free_module_element cimport FreeModuleElement cimport numpy cdef class Vector_numpy_dense(FreeModuleElement): diff --git a/src/sage/modules/vector_numpy_integer_dense.pxd b/src/sage/modules/vector_numpy_integer_dense.pxd index 77c5e1e7883..0793179063d 100644 --- a/src/sage/modules/vector_numpy_integer_dense.pxd +++ b/src/sage/modules/vector_numpy_integer_dense.pxd @@ -1,5 +1,5 @@ # sage_setup: distribution = sagemath-modules -from .vector_numpy_dense cimport Vector_numpy_dense +from sage.modules.vector_numpy_dense cimport Vector_numpy_dense cdef class Vector_numpy_integer_dense(Vector_numpy_dense): diff --git a/src/sage/modules/vector_rational_dense.pxd b/src/sage/modules/vector_rational_dense.pxd index 4b96c1158d7..51a58470ab6 100644 --- a/src/sage/modules/vector_rational_dense.pxd +++ b/src/sage/modules/vector_rational_dense.pxd @@ -1,5 +1,5 @@ # sage_setup: distribution = sagemath-modules -from .free_module_element cimport FreeModuleElement +from sage.modules.free_module_element cimport FreeModuleElement from sage.libs.gmp.types cimport mpq_t from sage.structure.parent cimport Parent diff --git a/src/sage/modules/vector_real_double_dense.pxd b/src/sage/modules/vector_real_double_dense.pxd index 282c26e5bf8..25dd3739c68 100644 --- a/src/sage/modules/vector_real_double_dense.pxd +++ b/src/sage/modules/vector_real_double_dense.pxd @@ -1,5 +1,5 @@ # sage_setup: distribution = sagemath-modules -from .vector_double_dense cimport Vector_double_dense +from sage.modules.vector_double_dense cimport Vector_double_dense cdef class Vector_real_double_dense(Vector_double_dense): pass diff --git a/src/sage/numerical/backends/cvxopt_backend.pyx b/src/sage/numerical/backends/cvxopt_backend.pyx index f6696931fab..782331fce22 100644 --- a/src/sage/numerical/backends/cvxopt_backend.pyx +++ b/src/sage/numerical/backends/cvxopt_backend.pyx @@ -19,7 +19,7 @@ AUTHORS: #***************************************************************************** from sage.numerical.mip import MIPSolverException -from .generic_backend cimport GenericBackend +from sage.numerical.backends.generic_backend cimport GenericBackend from copy import copy diff --git a/src/sage/numerical/backends/cvxopt_sdp_backend.pyx b/src/sage/numerical/backends/cvxopt_sdp_backend.pyx index 0142e35c983..58296da19d3 100644 --- a/src/sage/numerical/backends/cvxopt_sdp_backend.pyx +++ b/src/sage/numerical/backends/cvxopt_sdp_backend.pyx @@ -22,7 +22,7 @@ AUTHORS: from sage.numerical.sdp import SDPSolverException from sage.matrix.constructor import Matrix -from .matrix_sdp_backend cimport MatrixSDPBackend +from sage.numerical.backends.matrix_sdp_backend cimport MatrixSDPBackend cdef class CVXOPTSDPBackend(MatrixSDPBackend): diff --git a/src/sage/numerical/backends/glpk_backend.pxd b/src/sage/numerical/backends/glpk_backend.pxd index bc6421b4e12..0f2cc3aaf75 100644 --- a/src/sage/numerical/backends/glpk_backend.pxd +++ b/src/sage/numerical/backends/glpk_backend.pxd @@ -10,7 +10,7 @@ #***************************************************************************** from sage.libs.glpk.types cimport glp_prob, glp_iocp, glp_smcp -from .generic_backend cimport GenericBackend +from sage.numerical.backends.generic_backend cimport GenericBackend # search_tree_data_t: diff --git a/src/sage/numerical/backends/glpk_exact_backend.pxd b/src/sage/numerical/backends/glpk_exact_backend.pxd index b93ac03fa23..2b94d5ad968 100644 --- a/src/sage/numerical/backends/glpk_exact_backend.pxd +++ b/src/sage/numerical/backends/glpk_exact_backend.pxd @@ -9,7 +9,7 @@ # http://www.gnu.org/licenses/ #***************************************************************************** -from .glpk_backend cimport GLPKBackend +from sage.numerical.backends.glpk_backend cimport GLPKBackend cdef class GLPKExactBackend(GLPKBackend): cpdef int add_variable(self, lower_bound=*, upper_bound=*, binary=*, continuous=*, integer=*, obj=*, name=*) except -1 diff --git a/src/sage/numerical/backends/matrix_sdp_backend.pxd b/src/sage/numerical/backends/matrix_sdp_backend.pxd index 820c2b239f4..c127dc34bdd 100644 --- a/src/sage/numerical/backends/matrix_sdp_backend.pxd +++ b/src/sage/numerical/backends/matrix_sdp_backend.pxd @@ -1,5 +1,5 @@ # sage_setup: distribution = sagemath-polyhedra -from .generic_sdp_backend cimport GenericSDPBackend +from sage.numerical.backends.generic_sdp_backend cimport GenericSDPBackend cdef class MatrixSDPBackend(GenericSDPBackend): diff --git a/src/sage/numerical/backends/matrix_sdp_backend.pyx b/src/sage/numerical/backends/matrix_sdp_backend.pyx index 59e6a78420b..17f0d72a829 100644 --- a/src/sage/numerical/backends/matrix_sdp_backend.pyx +++ b/src/sage/numerical/backends/matrix_sdp_backend.pyx @@ -22,7 +22,7 @@ other classes implementing solvers. #***************************************************************************** from sage.matrix.constructor import Matrix -from .generic_sdp_backend cimport GenericSDPBackend +from sage.numerical.backends.generic_sdp_backend cimport GenericSDPBackend cdef class MatrixSDPBackend(GenericSDPBackend): diff --git a/src/sage/numerical/backends/ppl_backend.pyx b/src/sage/numerical/backends/ppl_backend.pyx index 2bb82ad4570..d86bb255da0 100644 --- a/src/sage/numerical/backends/ppl_backend.pyx +++ b/src/sage/numerical/backends/ppl_backend.pyx @@ -25,7 +25,7 @@ from sage.numerical.mip import MIPSolverException from ppl import MIP_Problem, Variable, Variables_Set, Linear_Expression from sage.rings.integer cimport Integer from sage.rings.rational cimport Rational -from .generic_backend cimport GenericBackend +from sage.numerical.backends.generic_backend cimport GenericBackend from copy import copy diff --git a/src/sage/numerical/backends/scip_backend.pxd b/src/sage/numerical/backends/scip_backend.pxd index 21d3b8f386c..634197437ea 100644 --- a/src/sage/numerical/backends/scip_backend.pxd +++ b/src/sage/numerical/backends/scip_backend.pxd @@ -9,7 +9,7 @@ # http://www.gnu.org/licenses/ #***************************************************************************** -from .generic_backend cimport GenericBackend +from sage.numerical.backends.generic_backend cimport GenericBackend cdef class SCIPBackend(GenericBackend): diff --git a/src/sage/plot/plot3d/base.pyx b/src/sage/plot/plot3d/base.pyx index 9d686f81b02..0633fe5f442 100644 --- a/src/sage/plot/plot3d/base.pyx +++ b/src/sage/plot/plot3d/base.pyx @@ -65,7 +65,7 @@ from sage.misc.fast_methods cimport hash_by_id from sage.modules.free_module_element import vector from sage.rings.real_double import RDF from .texture import Texture -from .transform cimport Transformation, point_c, face_c +from sage.plot.plot3d.transform cimport Transformation, point_c, face_c include "point_c.pxi" from sage.interfaces.tachyon import tachyon_rt diff --git a/src/sage/plot/plot3d/index_face_set.pxd b/src/sage/plot/plot3d/index_face_set.pxd index 23fda2c7333..b9c5045a8d6 100644 --- a/src/sage/plot/plot3d/index_face_set.pxd +++ b/src/sage/plot/plot3d/index_face_set.pxd @@ -1,6 +1,6 @@ # sage_setup: distribution = sagemath-plot -from .base cimport PrimitiveObject -from .transform cimport point_c, face_c, color_c +from sage.plot.plot3d.base cimport PrimitiveObject +from sage.plot.plot3d.transform cimport point_c, face_c, color_c cdef class IndexFaceSet(PrimitiveObject): cdef bint enclosed diff --git a/src/sage/plot/plot3d/index_face_set.pyx b/src/sage/plot/plot3d/index_face_set.pyx index 768f3023350..88e41e4b9c8 100644 --- a/src/sage/plot/plot3d/index_face_set.pyx +++ b/src/sage/plot/plot3d/index_face_set.pyx @@ -63,7 +63,7 @@ from sage.plot.colors import Color, float_to_integer from sage.plot.plot3d.base import Graphics3dGroup from sage.plot.plot3d.texture import Texture -from .transform cimport Transformation +from sage.plot.plot3d.transform cimport Transformation # -------------------------------------------------------------------- diff --git a/src/sage/plot/plot3d/parametric_surface.pxd b/src/sage/plot/plot3d/parametric_surface.pxd index c169586e216..462de5ffadb 100644 --- a/src/sage/plot/plot3d/parametric_surface.pxd +++ b/src/sage/plot/plot3d/parametric_surface.pxd @@ -1,6 +1,6 @@ # sage_setup: distribution = sagemath-plot -from .index_face_set cimport IndexFaceSet -from .transform cimport point_c +from sage.plot.plot3d.index_face_set cimport IndexFaceSet +from sage.plot.plot3d.transform cimport point_c cdef class ParametricSurface(IndexFaceSet): cdef object f diff --git a/src/sage/plot/plot3d/parametric_surface.pyx b/src/sage/plot/plot3d/parametric_surface.pyx index 6b0ee0bf6f1..5a3556e7025 100644 --- a/src/sage/plot/plot3d/parametric_surface.pyx +++ b/src/sage/plot/plot3d/parametric_surface.pyx @@ -124,7 +124,7 @@ from sage.rings.real_double import RDF from sage.plot.colors import check_color_data from .base import RenderParams -from .transform cimport point_c, face_c +from sage.plot.plot3d.transform cimport point_c, face_c from sage.ext.interpreters.wrapper_rdf cimport Wrapper_rdf include "point_c.pxi" diff --git a/src/sage/plot/plot3d/shapes.pxd b/src/sage/plot/plot3d/shapes.pxd index 602b949fc2c..25c30a147b4 100644 --- a/src/sage/plot/plot3d/shapes.pxd +++ b/src/sage/plot/plot3d/shapes.pxd @@ -1,5 +1,5 @@ # sage_setup: distribution = sagemath-plot -from .parametric_surface cimport ParametricSurface +from sage.plot.plot3d.parametric_surface cimport ParametricSurface cdef class Cone(ParametricSurface): diff --git a/src/sage/plot/plot3d/shapes.pyx b/src/sage/plot/plot3d/shapes.pyx index 968423d1552..9b07dec1775 100644 --- a/src/sage/plot/plot3d/shapes.pyx +++ b/src/sage/plot/plot3d/shapes.pyx @@ -58,8 +58,8 @@ from sage.rings.real_double import RDF from sage.modules.free_module_element import vector from sage.misc.decorators import rename_keyword from .base import Graphics3dGroup -from .index_face_set cimport IndexFaceSet, PrimitiveObject -from .transform cimport point_c +from sage.plot.plot3d.index_face_set cimport IndexFaceSet, PrimitiveObject +from sage.plot.plot3d.transform cimport point_c # Helper function to check that Box input is right diff --git a/src/sage/rings/abc.pxd b/src/sage/rings/abc.pxd index 7a6ae3d5674..991773f0359 100644 --- a/src/sage/rings/abc.pxd +++ b/src/sage/rings/abc.pxd @@ -1,5 +1,5 @@ # sage_setup: distribution = sagemath-categories -from .ring cimport CommutativeRing, Field +from sage.rings.ring cimport CommutativeRing, Field cdef class RealField(Field): diff --git a/src/sage/rings/complex_conversion.pyx b/src/sage/rings/complex_conversion.pyx index 8dd064b410b..31afe86b5cd 100644 --- a/src/sage/rings/complex_conversion.pyx +++ b/src/sage/rings/complex_conversion.pyx @@ -1,6 +1,6 @@ # sage_setup: distribution = sagemath-modules -from .complex_double cimport ComplexDoubleElement -from .complex_mpfr cimport ComplexNumber +from sage.rings.complex_double cimport ComplexDoubleElement +from sage.rings.complex_mpfr cimport ComplexNumber from sage.libs.mpfr cimport mpfr_get_d, MPFR_RNDN from sage.libs.gsl.complex cimport GSL_SET_COMPLEX diff --git a/src/sage/rings/complex_double.pyx b/src/sage/rings/complex_double.pyx index 00bee432019..0500f0520b0 100644 --- a/src/sage/rings/complex_double.pyx +++ b/src/sage/rings/complex_double.pyx @@ -106,9 +106,9 @@ complex_double_element_gamma = None complex_double_element_gamma_inc = None complex_double_element_zeta = None -from .complex_conversion cimport CCtoCDF +from sage.rings.complex_conversion cimport CCtoCDF -from .real_double cimport RealDoubleElement, double_repr +from sage.rings.real_double cimport RealDoubleElement, double_repr from .real_double import RDF from sage.rings.integer_ring import ZZ from sage.structure.richcmp cimport rich_to_bool diff --git a/src/sage/rings/complex_interval.pxd b/src/sage/rings/complex_interval.pxd index bc9ba596082..0d4909c41cf 100644 --- a/src/sage/rings/complex_interval.pxd +++ b/src/sage/rings/complex_interval.pxd @@ -4,7 +4,7 @@ from sage.libs.mpfr.types cimport mpfr_prec_t from sage.libs.mpfi.types cimport mpfi_t cimport sage.structure.element -from .real_mpfi cimport RealIntervalFieldElement, RealIntervalField_class +from sage.rings.real_mpfi cimport RealIntervalFieldElement, RealIntervalField_class cdef class ComplexIntervalFieldElement(sage.structure.element.FieldElement): diff --git a/src/sage/rings/complex_interval.pyx b/src/sage/rings/complex_interval.pyx index d6874f6bbed..0af64503ebe 100644 --- a/src/sage/rings/complex_interval.pyx +++ b/src/sage/rings/complex_interval.pyx @@ -67,11 +67,11 @@ from sage.arith.constants cimport LOG_TEN_TWO_PLUS_EPSILON from sage.structure.element cimport FieldElement from sage.structure.parent cimport Parent -from .complex_mpfr cimport ComplexNumber +from sage.rings.complex_mpfr cimport ComplexNumber from sage.rings.integer cimport Integer cimport sage.rings.real_mpfi as real_mpfi -from .real_mpfr cimport RealNumber -from .convert.mpfi cimport mpfi_set_sage +from sage.rings.real_mpfr cimport RealNumber +from sage.rings.convert.mpfi cimport mpfi_set_sage from .infinity import infinity diff --git a/src/sage/rings/complex_mpc.pyx b/src/sage/rings/complex_mpc.pyx index 17135a6a935..b9c185e0344 100644 --- a/src/sage/rings/complex_mpc.pyx +++ b/src/sage/rings/complex_mpc.pyx @@ -80,12 +80,12 @@ except ImportError: pari_gen = PariError = () -from .integer cimport Integer -from .complex_mpfr cimport ComplexNumber +from sage.rings.integer cimport Integer +from sage.rings.complex_mpfr cimport ComplexNumber from .complex_mpfr import ComplexField_class from sage.misc.randstate cimport randstate, current_randstate -from .real_mpfr cimport RealField_class, RealNumber +from sage.rings.real_mpfr cimport RealField_class, RealNumber from .real_mpfr import mpfr_prec_min, mpfr_prec_max from sage.structure.richcmp cimport rich_to_bool, richcmp from sage.categories.fields import Fields diff --git a/src/sage/rings/complex_mpfr.pxd b/src/sage/rings/complex_mpfr.pxd index 4025a747655..a676d407d40 100644 --- a/src/sage/rings/complex_mpfr.pxd +++ b/src/sage/rings/complex_mpfr.pxd @@ -2,7 +2,7 @@ from sage.libs.mpfr.types cimport mpfr_t, mpfr_prec_t cimport sage.structure.element -from .real_mpfr cimport RealNumber +from sage.rings.real_mpfr cimport RealNumber cdef class ComplexNumber(sage.structure.element.FieldElement): cdef mpfr_t __re diff --git a/src/sage/rings/complex_mpfr.pyx b/src/sage/rings/complex_mpfr.pyx index 25f01d8f988..5922f4f1f3d 100644 --- a/src/sage/rings/complex_mpfr.pyx +++ b/src/sage/rings/complex_mpfr.pyx @@ -48,10 +48,10 @@ from sage.misc.sage_eval import sage_eval import sage.rings.abc from sage.arith.constants cimport LOG_TEN_TWO_PLUS_EPSILON from . import infinity -from .integer cimport Integer +from sage.rings.integer cimport Integer -from .complex_double cimport ComplexDoubleElement -from .real_mpfr cimport RealNumber +from sage.rings.complex_double cimport ComplexDoubleElement +from sage.rings.real_mpfr cimport RealNumber from sage.libs.gsl.complex cimport * from sage.libs.mpmath.sage_utils cimport mpfr_to_mpfval diff --git a/src/sage/rings/convert/mpfi.pyx b/src/sage/rings/convert/mpfi.pyx index b9ee56fbdbc..e7daaac7b94 100644 --- a/src/sage/rings/convert/mpfi.pyx +++ b/src/sage/rings/convert/mpfi.pyx @@ -24,14 +24,14 @@ from sage.cpython.string cimport bytes_to_str from sage.structure.element cimport Element import sage.rings.abc -from ..integer cimport Integer -from ..rational cimport Rational -from ..real_mpfi cimport RealIntervalFieldElement, RealIntervalField_class -from ..real_mpfr cimport RealNumber -from ..real_double cimport RealDoubleElement -from ..complex_mpfr cimport ComplexNumber -from ..complex_interval cimport ComplexIntervalFieldElement -from ..complex_double cimport ComplexDoubleElement +from sage.rings.integer cimport Integer +from sage.rings.rational cimport Rational +from sage.rings.real_mpfi cimport RealIntervalFieldElement, RealIntervalField_class +from sage.rings.real_mpfr cimport RealNumber +from sage.rings.real_double cimport RealDoubleElement +from sage.rings.complex_mpfr cimport ComplexNumber +from sage.rings.complex_interval cimport ComplexIntervalFieldElement +from sage.rings.complex_double cimport ComplexDoubleElement from cypari2.gen cimport Gen diff --git a/src/sage/rings/finite_rings/element_givaro.pyx b/src/sage/rings/finite_rings/element_givaro.pyx index 1d2b30af0ae..b2f3813b2a2 100644 --- a/src/sage/rings/finite_rings/element_givaro.pyx +++ b/src/sage/rings/finite_rings/element_givaro.pyx @@ -58,7 +58,7 @@ from cysignals.signals cimport sig_on, sig_off from cypari2.paridecl cimport * from sage.misc.randstate cimport current_randstate -from .element_pari_ffelt cimport FiniteFieldElement_pari_ffelt +from sage.rings.finite_rings.element_pari_ffelt cimport FiniteFieldElement_pari_ffelt from sage.structure.richcmp cimport richcmp import sage.arith.all diff --git a/src/sage/rings/finite_rings/element_pari_ffelt.pyx b/src/sage/rings/finite_rings/element_pari_ffelt.pyx index 1fa31c102d2..da77fa501a2 100644 --- a/src/sage/rings/finite_rings/element_pari_ffelt.pyx +++ b/src/sage/rings/finite_rings/element_pari_ffelt.pyx @@ -26,7 +26,7 @@ from sage.libs.pari.convert_gmp cimport _new_GEN_from_mpz_t from cypari2.stack cimport new_gen, new_gen_noclear, clear_stack from cypari2.gen cimport Gen as pari_gen, objtogen -from .element_base cimport FinitePolyExtElement +from sage.rings.finite_rings.element_base cimport FinitePolyExtElement from .integer_mod import IntegerMod_abstract import sage.rings.integer diff --git a/src/sage/rings/finite_rings/hom_finite_field_givaro.pyx b/src/sage/rings/finite_rings/hom_finite_field_givaro.pyx index 0c0d6e4689e..fb60b6557ed 100644 --- a/src/sage/rings/finite_rings/hom_finite_field_givaro.pyx +++ b/src/sage/rings/finite_rings/hom_finite_field_givaro.pyx @@ -34,21 +34,21 @@ AUTHOR: from sage.rings.finite_rings.finite_field_constructor import FiniteField -from .hom_finite_field cimport SectionFiniteFieldHomomorphism_generic -from .hom_finite_field cimport FiniteFieldHomomorphism_generic -from .hom_finite_field cimport FrobeniusEndomorphism_finite_field +from sage.rings.finite_rings.hom_finite_field cimport SectionFiniteFieldHomomorphism_generic +from sage.rings.finite_rings.hom_finite_field cimport FiniteFieldHomomorphism_generic +from sage.rings.finite_rings.hom_finite_field cimport FrobeniusEndomorphism_finite_field -from .hom_prime_finite_field cimport FiniteFieldHomomorphism_prime +from sage.rings.finite_rings.hom_prime_finite_field cimport FiniteFieldHomomorphism_prime from sage.categories.homset import Hom from sage.structure.element cimport Element from sage.rings.finite_rings.finite_field_givaro import FiniteField_givaro -from .element_givaro cimport FiniteField_givaroElement +from sage.rings.finite_rings.element_givaro cimport FiniteField_givaroElement #from element_givaro cimport make_FiniteField_givaroElement from sage.structure.parent cimport Parent -from .element_givaro cimport Cache_givaro +from sage.rings.finite_rings.element_givaro cimport Cache_givaro cdef class SectionFiniteFieldHomomorphism_givaro(SectionFiniteFieldHomomorphism_generic): diff --git a/src/sage/rings/finite_rings/hom_prime_finite_field.pxd b/src/sage/rings/finite_rings/hom_prime_finite_field.pxd index 024e7a50857..af571b31f84 100644 --- a/src/sage/rings/finite_rings/hom_prime_finite_field.pxd +++ b/src/sage/rings/finite_rings/hom_prime_finite_field.pxd @@ -1,5 +1,5 @@ # sage_setup: distribution = sagemath-categories -from .hom_finite_field cimport (SectionFiniteFieldHomomorphism_generic, +from sage.rings.finite_rings.hom_finite_field cimport (SectionFiniteFieldHomomorphism_generic, FiniteFieldHomomorphism_generic, FrobeniusEndomorphism_finite_field) diff --git a/src/sage/rings/finite_rings/hom_prime_finite_field.pyx b/src/sage/rings/finite_rings/hom_prime_finite_field.pyx index 88cb3edaa55..48510c87c93 100644 --- a/src/sage/rings/finite_rings/hom_prime_finite_field.pyx +++ b/src/sage/rings/finite_rings/hom_prime_finite_field.pyx @@ -28,9 +28,9 @@ AUTHOR: from sage.categories.homset import Hom from sage.structure.element cimport Element -from .hom_finite_field cimport SectionFiniteFieldHomomorphism_generic -from .hom_finite_field cimport FiniteFieldHomomorphism_generic -from .hom_finite_field cimport FrobeniusEndomorphism_finite_field +from sage.rings.finite_rings.hom_finite_field cimport SectionFiniteFieldHomomorphism_generic +from sage.rings.finite_rings.hom_finite_field cimport FiniteFieldHomomorphism_generic +from sage.rings.finite_rings.hom_finite_field cimport FrobeniusEndomorphism_finite_field from sage.rings.finite_rings.finite_field_base import FiniteField diff --git a/src/sage/rings/integer_ring.pxd b/src/sage/rings/integer_ring.pxd index a19ad82fc28..54b05a9c6e1 100644 --- a/src/sage/rings/integer_ring.pxd +++ b/src/sage/rings/integer_ring.pxd @@ -1,6 +1,6 @@ # sage_setup: distribution = sagemath-categories -from .ring cimport PrincipalIdealDomain -from .integer cimport Integer +from sage.rings.ring cimport PrincipalIdealDomain +from sage.rings.integer cimport Integer from sage.libs.gmp.types cimport mpz_t cdef class IntegerRing_class(PrincipalIdealDomain): diff --git a/src/sage/rings/laurent_series_ring_element.pyx b/src/sage/rings/laurent_series_ring_element.pyx index cbdf95d2fdc..9d02842e85a 100644 --- a/src/sage/rings/laurent_series_ring_element.pyx +++ b/src/sage/rings/laurent_series_ring_element.pyx @@ -72,7 +72,7 @@ from .infinity import infinity from sage.rings.rational_field import QQ import sage.misc.latex from sage.rings.polynomial.laurent_polynomial import LaurentPolynomial_univariate -from .power_series_ring_element cimport PowerSeries +from sage.rings.power_series_ring_element cimport PowerSeries from sage.structure.element cimport Element, AlgebraElement from sage.structure.richcmp cimport richcmp_not_equal, rich_to_bool from sage.misc.derivative import multi_derivative diff --git a/src/sage/rings/number_field/number_field_element_quadratic.pxd b/src/sage/rings/number_field/number_field_element_quadratic.pxd index 14b437b43c7..4235f551a47 100644 --- a/src/sage/rings/number_field/number_field_element_quadratic.pxd +++ b/src/sage/rings/number_field/number_field_element_quadratic.pxd @@ -3,7 +3,7 @@ from sage.libs.gmp.types cimport mpz_t from sage.libs.arb.types cimport arb_t from sage.rings.integer cimport Integer from sage.rings.rational cimport Rational -from .number_field_element cimport NumberFieldElement, NumberFieldElement_absolute +from sage.rings.number_field.number_field_element cimport NumberFieldElement, NumberFieldElement_absolute cdef class NumberFieldElement_quadratic(NumberFieldElement_absolute): diff --git a/src/sage/rings/polynomial/evaluation.pxd b/src/sage/rings/polynomial/evaluation.pxd index 4978e83a831..bbd1ba97b4b 100644 --- a/src/sage/rings/polynomial/evaluation.pxd +++ b/src/sage/rings/polynomial/evaluation.pxd @@ -1,2 +1,2 @@ -from .evaluation_flint cimport * -from .evaluation_ntl cimport * +from sage.rings.polynomial.evaluation_flint cimport * +from sage.rings.polynomial.evaluation_ntl cimport * diff --git a/src/sage/rings/polynomial/multi_polynomial.pxd b/src/sage/rings/polynomial/multi_polynomial.pxd index baeaee6be19..e6792991411 100644 --- a/src/sage/rings/polynomial/multi_polynomial.pxd +++ b/src/sage/rings/polynomial/multi_polynomial.pxd @@ -1,5 +1,5 @@ # sage_setup: distribution = sagemath-categories -from .commutative_polynomial cimport CommutativePolynomial +from sage.rings.polynomial.commutative_polynomial cimport CommutativePolynomial cdef class MPolynomial(CommutativePolynomial): diff --git a/src/sage/rings/polynomial/polynomial_element.pxd b/src/sage/rings/polynomial/polynomial_element.pxd index fb241462e93..84087163138 100644 --- a/src/sage/rings/polynomial/polynomial_element.pxd +++ b/src/sage/rings/polynomial/polynomial_element.pxd @@ -3,8 +3,8 @@ from sage.structure.element import Element from sage.structure.element cimport Element, CommutativeAlgebraElement, ModuleElement from sage.structure.parent cimport Parent from sage.rings.integer cimport Integer -from .commutative_polynomial cimport CommutativePolynomial -from .polynomial_compiled cimport CompiledPolynomialFunction +from sage.rings.polynomial.commutative_polynomial cimport CommutativePolynomial +from sage.rings.polynomial.polynomial_compiled cimport CompiledPolynomialFunction cdef class Polynomial(CommutativePolynomial): diff --git a/src/sage/rings/polynomial/polynomial_element.pyx b/src/sage/rings/polynomial/polynomial_element.pyx index d29608fa1a4..19c742376cc 100644 --- a/src/sage/rings/polynomial/polynomial_element.pyx +++ b/src/sage/rings/polynomial/polynomial_element.pyx @@ -183,7 +183,7 @@ cpdef is_Polynomial(f): return isinstance(f, Polynomial) -from .polynomial_compiled cimport CompiledPolynomialFunction +from sage.rings.polynomial.polynomial_compiled cimport CompiledPolynomialFunction from sage.rings.polynomial.polydict cimport ETuple diff --git a/src/sage/rings/polynomial/polynomial_real_mpfr_dense.pyx b/src/sage/rings/polynomial/polynomial_real_mpfr_dense.pyx index 27a82a4761b..eeb2a99304a 100644 --- a/src/sage/rings/polynomial/polynomial_real_mpfr_dense.pyx +++ b/src/sage/rings/polynomial/polynomial_real_mpfr_dense.pyx @@ -31,7 +31,7 @@ from cpython.int cimport PyInt_AS_LONG from cpython.float cimport PyFloat_AS_DOUBLE from sage.structure.parent cimport Parent -from .polynomial_element cimport Polynomial, _dict_to_list +from sage.rings.polynomial.polynomial_element cimport Polynomial, _dict_to_list from sage.rings.real_mpfr cimport RealField_class, RealNumber from sage.rings.integer cimport Integer, smallInteger from sage.rings.rational cimport Rational diff --git a/src/sage/rings/power_series_mpoly.pxd b/src/sage/rings/power_series_mpoly.pxd index 82a78e32fd5..ad0723ed59c 100644 --- a/src/sage/rings/power_series_mpoly.pxd +++ b/src/sage/rings/power_series_mpoly.pxd @@ -1,6 +1,6 @@ # sage_setup: distribution = sagemath-categories from sage.structure.element cimport ModuleElement -from .power_series_ring_element cimport PowerSeries +from sage.rings.power_series_ring_element cimport PowerSeries cdef class PowerSeries_mpoly(PowerSeries): cdef ModuleElement __f diff --git a/src/sage/rings/power_series_mpoly.pyx b/src/sage/rings/power_series_mpoly.pyx index d82e83fa4d7..22cd86bfc72 100644 --- a/src/sage/rings/power_series_mpoly.pyx +++ b/src/sage/rings/power_series_mpoly.pyx @@ -1,7 +1,7 @@ # sage_setup: distribution = sagemath-categories # NOT ready to be used -- possibly should be deleted. -from .power_series_ring_element cimport PowerSeries +from sage.rings.power_series_ring_element cimport PowerSeries from sage.structure.element cimport Element from .infinity import infinity from .polynomial.multi_polynomial_ring_base import is_MPolynomialRing diff --git a/src/sage/rings/power_series_pari.pxd b/src/sage/rings/power_series_pari.pxd index cdc1b1a5550..21028c6861a 100644 --- a/src/sage/rings/power_series_pari.pxd +++ b/src/sage/rings/power_series_pari.pxd @@ -1,7 +1,7 @@ # sage_setup: distribution = sagemath-pari from cypari2.gen cimport Gen as pari_gen -from .power_series_ring_element cimport PowerSeries +from sage.rings.power_series_ring_element cimport PowerSeries cdef class PowerSeries_pari(PowerSeries): cdef pari_gen g diff --git a/src/sage/rings/power_series_poly.pxd b/src/sage/rings/power_series_poly.pxd index f54d801f6a6..e31c8bf6feb 100644 --- a/src/sage/rings/power_series_poly.pxd +++ b/src/sage/rings/power_series_poly.pxd @@ -1,5 +1,5 @@ # sage_setup: distribution = sagemath-categories -from .power_series_ring_element cimport PowerSeries +from sage.rings.power_series_ring_element cimport PowerSeries from sage.rings.polynomial.polynomial_element cimport Polynomial from sage.categories.action cimport Action diff --git a/src/sage/rings/power_series_poly.pyx b/src/sage/rings/power_series_poly.pyx index e9cc62af1ea..55bef33c962 100644 --- a/src/sage/rings/power_series_poly.pyx +++ b/src/sage/rings/power_series_poly.pyx @@ -5,7 +5,7 @@ Power Series Methods The class ``PowerSeries_poly`` provides additional methods for univariate power series. """ -from .power_series_ring_element cimport PowerSeries +from sage.rings.power_series_ring_element cimport PowerSeries from sage.structure.element cimport Element from .infinity import infinity diff --git a/src/sage/rings/rational.pyx b/src/sage/rings/rational.pyx index 29ea1b2aed4..81dc2e2a61f 100644 --- a/src/sage/rings/rational.pyx +++ b/src/sage/rings/rational.pyx @@ -73,7 +73,7 @@ from sage.structure.richcmp cimport rich_to_bool_sgn import sage.rings.rational_field cimport sage.rings.integer as integer -from .integer cimport Integer +from sage.rings.integer cimport Integer from .integer_ring import ZZ diff --git a/src/sage/rings/real_double_element_gsl.pxd b/src/sage/rings/real_double_element_gsl.pxd index 395a6a1a461..7cc9786efa5 100644 --- a/src/sage/rings/real_double_element_gsl.pxd +++ b/src/sage/rings/real_double_element_gsl.pxd @@ -1,5 +1,5 @@ # sage_setup: distribution = sagemath-modules -from .real_double cimport RealDoubleElement +from sage.rings.real_double cimport RealDoubleElement cdef class RealDoubleElement_gsl(RealDoubleElement): diff --git a/src/sage/rings/real_mpfi.pxd b/src/sage/rings/real_mpfi.pxd index 1c5fb5c44d0..d1275e93e6e 100644 --- a/src/sage/rings/real_mpfi.pxd +++ b/src/sage/rings/real_mpfi.pxd @@ -6,8 +6,8 @@ from sage.rings.ring cimport Field cimport sage.rings.abc from sage.structure.element cimport RingElement -from .rational cimport Rational -from .real_mpfr cimport RealField_class +from sage.rings.rational cimport Rational +from sage.rings.real_mpfr cimport RealField_class cdef class RealIntervalFieldElement(RingElement) # forward decl diff --git a/src/sage/rings/real_mpfi.pyx b/src/sage/rings/real_mpfi.pyx index ba168e3cbcb..00b08ad3ab6 100644 --- a/src/sage/rings/real_mpfi.pyx +++ b/src/sage/rings/real_mpfi.pyx @@ -270,9 +270,9 @@ from sage.structure.element cimport have_same_parent from sage.structure.parent cimport Parent from sage.structure.richcmp cimport richcmp -from .convert.mpfi cimport mpfi_set_sage -from .real_mpfr cimport RealField_class, RealNumber, RealField -from .integer cimport Integer +from sage.rings.convert.mpfi cimport mpfi_set_sage +from sage.rings.real_mpfr cimport RealField_class, RealNumber, RealField +from sage.rings.integer cimport Integer from .integer_ring import ZZ from .rational_field import QQ diff --git a/src/sage/rings/real_mpfr.pyx b/src/sage/rings/real_mpfr.pyx index 32bdbd4f36b..f8f98ad6605 100644 --- a/src/sage/rings/real_mpfr.pyx +++ b/src/sage/rings/real_mpfr.pyx @@ -146,12 +146,12 @@ import operator from sage.libs.mpmath.sage_utils cimport mpfr_to_mpfval -from .integer cimport Integer -from .rational cimport Rational +from sage.rings.integer cimport Integer +from sage.rings.rational cimport Rational from sage.categories.map cimport Map -from .real_double cimport RealDoubleElement +from sage.rings.real_double cimport RealDoubleElement import sage.rings.abc import sage.rings.rational_field diff --git a/src/sage/stats/distributions/discrete_gaussian_integer.pxd b/src/sage/stats/distributions/discrete_gaussian_integer.pxd index c720255dece..d65e7679a87 100644 --- a/src/sage/stats/distributions/discrete_gaussian_integer.pxd +++ b/src/sage/stats/distributions/discrete_gaussian_integer.pxd @@ -1,5 +1,5 @@ # sage_setup: distribution = sagemath-modules -from .dgs cimport dgs_disc_gauss_mp_t, dgs_disc_gauss_dp_t +from sage.stats.distributions.dgs cimport dgs_disc_gauss_mp_t, dgs_disc_gauss_dp_t from sage.structure.sage_object cimport SageObject from sage.rings.real_mpfr cimport RealNumber diff --git a/src/sage/stats/distributions/discrete_gaussian_integer.pyx b/src/sage/stats/distributions/discrete_gaussian_integer.pyx index e62b102da92..55625af5320 100644 --- a/src/sage/stats/distributions/discrete_gaussian_integer.pyx +++ b/src/sage/stats/distributions/discrete_gaussian_integer.pyx @@ -149,9 +149,9 @@ from sage.libs.mpfr cimport mpfr_set, MPFR_RNDN from sage.rings.integer cimport Integer from sage.misc.randstate cimport randstate, current_randstate -from .dgs cimport dgs_disc_gauss_mp_init, dgs_disc_gauss_mp_clear, dgs_disc_gauss_mp_flush_cache -from .dgs cimport dgs_disc_gauss_dp_init, dgs_disc_gauss_dp_clear, dgs_disc_gauss_dp_flush_cache -from .dgs cimport DGS_DISC_GAUSS_UNIFORM_TABLE, DGS_DISC_GAUSS_UNIFORM_ONLINE, DGS_DISC_GAUSS_UNIFORM_LOGTABLE, DGS_DISC_GAUSS_SIGMA2_LOGTABLE +from sage.stats.distributions.dgs cimport dgs_disc_gauss_mp_init, dgs_disc_gauss_mp_clear, dgs_disc_gauss_mp_flush_cache +from sage.stats.distributions.dgs cimport dgs_disc_gauss_dp_init, dgs_disc_gauss_dp_clear, dgs_disc_gauss_dp_flush_cache +from sage.stats.distributions.dgs cimport DGS_DISC_GAUSS_UNIFORM_TABLE, DGS_DISC_GAUSS_UNIFORM_ONLINE, DGS_DISC_GAUSS_UNIFORM_LOGTABLE, DGS_DISC_GAUSS_SIGMA2_LOGTABLE cdef class DiscreteGaussianDistributionIntegerSampler(SageObject): r""" diff --git a/src/sage/stats/hmm/chmm.pyx b/src/sage/stats/hmm/chmm.pyx index 28e37cff2e4..882e0e99e55 100644 --- a/src/sage/stats/hmm/chmm.pyx +++ b/src/sage/stats/hmm/chmm.pyx @@ -29,9 +29,9 @@ from sage.structure.element import is_Matrix from sage.stats.time_series cimport TimeSeries from sage.stats.intlist cimport IntList -from .hmm cimport HiddenMarkovModel -from .util cimport HMM_Util -from .distributions cimport GaussianMixtureDistribution +from sage.stats.hmm.hmm cimport HiddenMarkovModel +from sage.stats.hmm.util cimport HMM_Util +from sage.stats.hmm.distributions cimport GaussianMixtureDistribution cdef HMM_Util util = HMM_Util() diff --git a/src/sage/stats/hmm/hmm.pyx b/src/sage/stats/hmm/hmm.pyx index 8bdc9dc502c..ade5b80c4ed 100644 --- a/src/sage/stats/hmm/hmm.pyx +++ b/src/sage/stats/hmm/hmm.pyx @@ -42,7 +42,7 @@ from sage.matrix.constructor import matrix from sage.misc.randstate cimport current_randstate, randstate from cpython.object cimport PyObject_RichCompare -from .util cimport HMM_Util +from sage.stats.hmm.util cimport HMM_Util cdef HMM_Util util = HMM_Util() diff --git a/src/sage/structure/coerce.pxd b/src/sage/structure/coerce.pxd index 92bca7b2141..d98fc348ad6 100644 --- a/src/sage/structure/coerce.pxd +++ b/src/sage/structure/coerce.pxd @@ -1,6 +1,6 @@ # sage_setup: distribution = sagemath-objects -from .parent cimport Parent -from .coerce_dict cimport TripleDict +from sage.structure.parent cimport Parent +from sage.structure.coerce_dict cimport TripleDict cpdef py_scalar_parent(py_type) cpdef py_scalar_to_element(py) diff --git a/src/sage/structure/coerce.pyx b/src/sage/structure/coerce.pyx index 489af20c081..938f11c9c51 100644 --- a/src/sage/structure/coerce.pyx +++ b/src/sage/structure/coerce.pyx @@ -85,10 +85,10 @@ cimport gmpy2 cdef mul, truediv from operator import mul, truediv -from .richcmp cimport rich_to_bool, revop -from .sage_object cimport SageObject -from .parent cimport Parent_richcmp_element_without_coercion -from .element cimport bin_op_exception, parent, Element +from sage.structure.richcmp cimport rich_to_bool, revop +from sage.structure.sage_object cimport SageObject +from sage.structure.parent cimport Parent_richcmp_element_without_coercion +from sage.structure.element cimport bin_op_exception, parent, Element from .coerce_exceptions import CoercionException from sage.rings.integer_fake cimport is_Integer from sage.categories.map cimport Map diff --git a/src/sage/structure/coerce_actions.pyx b/src/sage/structure/coerce_actions.pyx index 4f9c7b882fa..084fe4b06c1 100644 --- a/src/sage/structure/coerce_actions.pyx +++ b/src/sage/structure/coerce_actions.pyx @@ -19,9 +19,9 @@ from cpython.int cimport * from cpython.number cimport * from cysignals.signals cimport sig_check -from .coerce cimport coercion_model -from .element cimport parent, Element, ModuleElement -from .parent cimport Parent +from sage.structure.coerce cimport coercion_model +from sage.structure.element cimport parent, Element, ModuleElement +from sage.structure.parent cimport Parent from .coerce_exceptions import CoercionException from sage.categories.action cimport InverseAction, PrecomposedAction from sage.arith.long cimport integer_check_long diff --git a/src/sage/structure/element.pxd b/src/sage/structure/element.pxd index b094e729eb9..5e168cbe960 100644 --- a/src/sage/structure/element.pxd +++ b/src/sage/structure/element.pxd @@ -1,6 +1,6 @@ # sage_setup: distribution = sagemath-objects -from .sage_object cimport SageObject -from .parent cimport Parent +from sage.structure.sage_object cimport SageObject +from sage.structure.parent cimport Parent from sage.misc.inherit_comparison cimport InheritComparisonMetaclass diff --git a/src/sage/structure/factory.pyx b/src/sage/structure/factory.pyx index d8fcee4c14c..35ce5df8773 100644 --- a/src/sage/structure/factory.pyx +++ b/src/sage/structure/factory.pyx @@ -57,7 +57,7 @@ AUTHORS: import types -from .sage_object cimport SageObject +from sage.structure.sage_object cimport SageObject cdef sage_version from sage.version import version as sage_version diff --git a/src/sage/structure/parent.pyx b/src/sage/structure/parent.pyx index 13aee064b27..6e786ca2e7c 100644 --- a/src/sage/structure/parent.pyx +++ b/src/sage/structure/parent.pyx @@ -121,12 +121,12 @@ from sage.categories.sets_cat import Sets, EmptySetError from sage.misc.lazy_string cimport _LazyString from sage.sets.pythonclass cimport Set_PythonType_class from .category_object import CategoryObject -from .coerce cimport coercion_model -from .coerce cimport parent_is_integers +from sage.structure.coerce cimport coercion_model +from sage.structure.coerce cimport parent_is_integers from .coerce_exceptions import CoercionException -from .coerce_maps cimport (NamedConvertMap, DefaultConvertMap, +from sage.structure.coerce_maps cimport (NamedConvertMap, DefaultConvertMap, DefaultConvertMap_unique, CallableConvertMap) -from .element cimport parent +from sage.structure.element cimport parent cdef _record_exception(): diff --git a/src/sage/structure/parent_base.pxd b/src/sage/structure/parent_base.pxd index b775df3ff30..3683c39d827 100644 --- a/src/sage/structure/parent_base.pxd +++ b/src/sage/structure/parent_base.pxd @@ -7,7 +7,7 @@ # https://www.gnu.org/licenses/ ############################################################################### -from .parent_old cimport Parent as Parent_old +from sage.structure.parent_old cimport Parent as Parent_old cdef class ParentWithBase(Parent_old): pass diff --git a/src/sage/structure/parent_gens.pxd b/src/sage/structure/parent_gens.pxd index 80680e01936..573db0c52fa 100644 --- a/src/sage/structure/parent_gens.pxd +++ b/src/sage/structure/parent_gens.pxd @@ -13,7 +13,7 @@ Parent objects with generators # http://www.gnu.org/licenses/ #***************************************************************************** -from .parent_base cimport ParentWithBase +from sage.structure.parent_base cimport ParentWithBase cdef class ParentWithGens(ParentWithBase): diff --git a/src/sage/structure/parent_old.pyx b/src/sage/structure/parent_old.pyx index 53c3e697951..c2e375319d8 100644 --- a/src/sage/structure/parent_old.pyx +++ b/src/sage/structure/parent_old.pyx @@ -28,7 +28,7 @@ This came up in some subtle bug once:: # https://www.gnu.org/licenses/ # **************************************************************************** from sage.misc.superseded import deprecation -from .coerce cimport py_scalar_parent +from sage.structure.coerce cimport py_scalar_parent from sage.ext.stdsage cimport HAS_DICTIONARY from sage.sets.pythonclass cimport Set_PythonType, Set_PythonType_class