From 446f5a28f8d8657177803faed20a378276363a34 Mon Sep 17 00:00:00 2001 From: Tobias Diez Date: Tue, 31 Oct 2023 05:53:25 +0000 Subject: [PATCH] Replace relative imports by absolute ones in ntl --- src/sage/libs/ntl/GF2.pxd | 2 +- src/sage/libs/ntl/GF2E.pxd | 2 +- src/sage/libs/ntl/GF2EX.pxd | 2 +- src/sage/libs/ntl/GF2X.pxd | 2 +- src/sage/libs/ntl/ZZ.pxd | 2 +- src/sage/libs/ntl/ZZX.pxd | 2 +- src/sage/libs/ntl/ZZ_p.pxd | 2 +- src/sage/libs/ntl/ZZ_pE.pxd | 2 +- src/sage/libs/ntl/ZZ_pEX.pxd | 2 +- src/sage/libs/ntl/ZZ_pX.pxd | 2 +- src/sage/libs/ntl/__init__.py | 3 ++- src/sage/libs/ntl/conversion.pxd | 2 +- src/sage/libs/ntl/convert.pxd | 2 +- src/sage/libs/ntl/error.pyx | 4 ++-- src/sage/libs/ntl/lzz_p.pxd | 2 +- src/sage/libs/ntl/lzz_pX.pxd | 2 +- src/sage/libs/ntl/mat_GF2.pxd | 2 +- src/sage/libs/ntl/mat_GF2E.pxd | 2 +- src/sage/libs/ntl/mat_ZZ.pxd | 2 +- src/sage/libs/ntl/ntl_GF2.pxd | 2 +- src/sage/libs/ntl/ntl_GF2E.pxd | 4 ++-- src/sage/libs/ntl/ntl_GF2E.pyx | 10 +++++----- src/sage/libs/ntl/ntl_GF2EContext.pxd | 4 ++-- src/sage/libs/ntl/ntl_GF2EX.pxd | 6 +++--- src/sage/libs/ntl/ntl_GF2EX.pyx | 8 ++++---- src/sage/libs/ntl/ntl_GF2X.pxd | 2 +- src/sage/libs/ntl/ntl_GF2X.pyx | 4 ++-- src/sage/libs/ntl/ntl_ZZX.pxd | 2 +- src/sage/libs/ntl/ntl_ZZ_p.pxd | 4 ++-- src/sage/libs/ntl/ntl_ZZ_pContext.pxd | 6 +++--- src/sage/libs/ntl/ntl_ZZ_pE.pxd | 6 +++--- src/sage/libs/ntl/ntl_ZZ_pEContext.pxd | 8 ++++---- src/sage/libs/ntl/ntl_ZZ_pEContext.pyx | 4 ++-- src/sage/libs/ntl/ntl_ZZ_pEX.pxd | 4 ++-- src/sage/libs/ntl/ntl_ZZ_pX.pxd | 2 +- src/sage/libs/ntl/ntl_lzz_p.pxd | 4 ++-- src/sage/libs/ntl/ntl_lzz_pContext.pxd | 2 +- src/sage/libs/ntl/ntl_mat_GF2.pxd | 4 ++-- src/sage/libs/ntl/ntl_mat_GF2.pyx | 2 +- src/sage/libs/ntl/ntl_mat_GF2E.pxd | 6 +++--- src/sage/libs/ntl/ntl_mat_GF2E.pyx | 6 +++--- src/sage/libs/ntl/ntl_mat_ZZ.pxd | 2 +- src/sage/libs/ntl/ntl_mat_ZZ.pyx | 2 +- src/sage/libs/ntl/vec_GF2.pxd | 2 +- src/sage/libs/ntl/vec_GF2E.pxd | 2 +- 45 files changed, 75 insertions(+), 74 deletions(-) diff --git a/src/sage/libs/ntl/GF2.pxd b/src/sage/libs/ntl/GF2.pxd index 9443f143dcf..5be7f496766 100644 --- a/src/sage/libs/ntl/GF2.pxd +++ b/src/sage/libs/ntl/GF2.pxd @@ -1,4 +1,4 @@ -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 352e35330fc..5a72efec6a4 100644 --- a/src/sage/libs/ntl/GF2E.pxd +++ b/src/sage/libs/ntl/GF2E.pxd @@ -1,4 +1,4 @@ -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 c9d272f1c5a..4a0df45c9f1 100644 --- a/src/sage/libs/ntl/GF2EX.pxd +++ b/src/sage/libs/ntl/GF2EX.pxd @@ -1,4 +1,4 @@ -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 1539a37c93c..9342f63244c 100644 --- a/src/sage/libs/ntl/GF2X.pxd +++ b/src/sage/libs/ntl/GF2X.pxd @@ -1,4 +1,4 @@ -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 2ac00565e78..fc8901fc31a 100644 --- a/src/sage/libs/ntl/ZZ.pxd +++ b/src/sage/libs/ntl/ZZ.pxd @@ -1,6 +1,6 @@ # 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 d46fce4bbb9..bc2780e3a83 100644 --- a/src/sage/libs/ntl/ZZX.pxd +++ b/src/sage/libs/ntl/ZZX.pxd @@ -1,7 +1,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 0bee7b282b9..1d7d95e4007 100644 --- a/src/sage/libs/ntl/ZZ_p.pxd +++ b/src/sage/libs/ntl/ZZ_p.pxd @@ -1,6 +1,6 @@ # 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 7d92bae4479..bdfb04cb783 100644 --- a/src/sage/libs/ntl/ZZ_pE.pxd +++ b/src/sage/libs/ntl/ZZ_pE.pxd @@ -1,6 +1,6 @@ # 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 7e2dc5626cd..78be3ee13ea 100644 --- a/src/sage/libs/ntl/ZZ_pEX.pxd +++ b/src/sage/libs/ntl/ZZ_pEX.pxd @@ -1,6 +1,6 @@ # 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 a48e815d018..8c9f609f1cd 100644 --- a/src/sage/libs/ntl/ZZ_pX.pxd +++ b/src/sage/libs/ntl/ZZ_pX.pxd @@ -1,6 +1,6 @@ # 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/__init__.py b/src/sage/libs/ntl/__init__.py index 5cdc57e0122..0ab0a2c43e7 100644 --- a/src/sage/libs/ntl/__init__.py +++ b/src/sage/libs/ntl/__init__.py @@ -1,2 +1,3 @@ -from .error import setup_NTL_error_callback +from sage.libs.ntl.error import setup_NTL_error_callback + setup_NTL_error_callback() diff --git a/src/sage/libs/ntl/conversion.pxd b/src/sage/libs/ntl/conversion.pxd index 840e3947ea3..e46cc66284e 100644 --- a/src/sage/libs/ntl/conversion.pxd +++ b/src/sage/libs/ntl/conversion.pxd @@ -23,7 +23,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 1a9532f0aba..58420abb94c 100644 --- a/src/sage/libs/ntl/convert.pxd +++ b/src/sage/libs/ntl/convert.pxd @@ -1,4 +1,4 @@ -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) noexcept diff --git a/src/sage/libs/ntl/error.pyx b/src/sage/libs/ntl/error.pyx index ac6cef82910..54443c13597 100644 --- a/src/sage/libs/ntl/error.pyx +++ b/src/sage/libs/ntl/error.pyx @@ -28,8 +28,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 a7f8d5c52b6..14d81bc8ab0 100644 --- a/src/sage/libs/ntl/lzz_p.pxd +++ b/src/sage/libs/ntl/lzz_p.pxd @@ -1,6 +1,6 @@ # 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 65995a5c4d2..72905fd1d54 100644 --- a/src/sage/libs/ntl/lzz_pX.pxd +++ b/src/sage/libs/ntl/lzz_pX.pxd @@ -1,6 +1,6 @@ # 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 89c8252c046..db535d800fc 100644 --- a/src/sage/libs/ntl/mat_GF2.pxd +++ b/src/sage/libs/ntl/mat_GF2.pxd @@ -1,4 +1,4 @@ -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 61250702247..e6c3b5fc622 100644 --- a/src/sage/libs/ntl/mat_GF2E.pxd +++ b/src/sage/libs/ntl/mat_GF2E.pxd @@ -1,4 +1,4 @@ -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 b40e51d53de..a676c90fb1b 100644 --- a/src/sage/libs/ntl/mat_ZZ.pxd +++ b/src/sage/libs/ntl/mat_ZZ.pxd @@ -1,4 +1,4 @@ -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 0eff25dd32c..2be873c950c 100644 --- a/src/sage/libs/ntl/ntl_GF2.pxd +++ b/src/sage/libs/ntl/ntl_GF2.pxd @@ -1,4 +1,4 @@ -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 f634042e7cb..93539cf8abf 100644 --- a/src/sage/libs/ntl/ntl_GF2E.pxd +++ b/src/sage/libs/ntl/ntl_GF2E.pxd @@ -1,5 +1,5 @@ -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 078a3e2e6f7..2e4fec38020 100644 --- a/src/sage/libs/ntl/ntl_GF2E.pyx +++ b/src/sage/libs/ntl/ntl_GF2E.pyx @@ -27,11 +27,11 @@ 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 .ntl_GF2EContext import ntl_GF2EContext +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 sage.libs.ntl.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 df1f44f87aa..01fc4676e58 100644 --- a/src/sage/libs/ntl/ntl_GF2EContext.pxd +++ b/src/sage/libs/ntl/ntl_GF2EContext.pxd @@ -1,5 +1,5 @@ -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 e9a98a3afd6..38c96a7fe52 100644 --- a/src/sage/libs/ntl/ntl_GF2EX.pxd +++ b/src/sage/libs/ntl/ntl_GF2EX.pxd @@ -1,6 +1,6 @@ -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 72d18cedd4a..4e1c4324915 100644 --- a/src/sage/libs/ntl/ntl_GF2EX.pyx +++ b/src/sage/libs/ntl/ntl_GF2EX.pyx @@ -27,10 +27,10 @@ include 'misc.pxi' 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_ZZ import unpickle_class_args +from sage.libs.ntl.ntl_GF2EContext import ntl_GF2EContext +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 5af874d0b9e..8d50c9d17d8 100644 --- a/src/sage/libs/ntl/ntl_GF2X.pxd +++ b/src/sage/libs/ntl/ntl_GF2X.pxd @@ -1,4 +1,4 @@ -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 787169e6dc7..f6781a68c7b 100644 --- a/src/sage/libs/ntl/ntl_GF2X.pyx +++ b/src/sage/libs/ntl/ntl_GF2X.pyx @@ -29,8 +29,8 @@ include 'decl.pxi' 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_ZZ import unpickle_class_value +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 5f6238f73f1..63e588c1d42 100644 --- a/src/sage/libs/ntl/ntl_ZZX.pxd +++ b/src/sage/libs/ntl/ntl_ZZX.pxd @@ -1,4 +1,4 @@ -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 08a0a3beb84..a92c9766112 100644 --- a/src/sage/libs/ntl/ntl_ZZ_p.pxd +++ b/src/sage/libs/ntl/ntl_ZZ_p.pxd @@ -1,5 +1,5 @@ -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 61269d95584..d60cab91d55 100644 --- a/src/sage/libs/ntl/ntl_ZZ_pContext.pxd +++ b/src/sage/libs/ntl/ntl_ZZ_pContext.pxd @@ -1,6 +1,6 @@ -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 cb9efd2279f..b2a1aa70293 100644 --- a/src/sage/libs/ntl/ntl_ZZ_pE.pxd +++ b/src/sage/libs/ntl/ntl_ZZ_pE.pxd @@ -1,6 +1,6 @@ -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 027c59465a9..70041817a63 100644 --- a/src/sage/libs/ntl/ntl_ZZ_pEContext.pxd +++ b/src/sage/libs/ntl/ntl_ZZ_pEContext.pxd @@ -1,7 +1,7 @@ -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_pEContext.pyx b/src/sage/libs/ntl/ntl_ZZ_pEContext.pyx index affd31d299d..03ff00f21d4 100644 --- a/src/sage/libs/ntl/ntl_ZZ_pEContext.pyx +++ b/src/sage/libs/ntl/ntl_ZZ_pEContext.pyx @@ -148,7 +148,7 @@ cdef class ntl_ZZ_pEContext_class(): sage: c.ZZ_pE([4,3]) [4 3] """ - from .ntl_ZZ_pE import ntl_ZZ_pE + from sage.libs.ntl.ntl_ZZ_pE import ntl_ZZ_pE return ntl_ZZ_pE(v,modulus=self) def ZZ_pEX(self, v = None): @@ -161,7 +161,7 @@ cdef class ntl_ZZ_pEContext_class(): sage: c.ZZ_pEX([4,3]) [[4] [3]] """ - from .ntl_ZZ_pEX import ntl_ZZ_pEX + from sage.libs.ntl.ntl_ZZ_pEX import ntl_ZZ_pEX return ntl_ZZ_pEX(v, modulus=self) cpdef void _assert_is_current_modulus(self) except *: diff --git a/src/sage/libs/ntl/ntl_ZZ_pEX.pxd b/src/sage/libs/ntl/ntl_ZZ_pEX.pxd index de3e1e54fff..26ef2baf302 100644 --- a/src/sage/libs/ntl/ntl_ZZ_pEX.pxd +++ b/src/sage/libs/ntl/ntl_ZZ_pEX.pxd @@ -1,5 +1,5 @@ -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 e414fc5c272..38792bca2d1 100644 --- a/src/sage/libs/ntl/ntl_ZZ_pX.pxd +++ b/src/sage/libs/ntl/ntl_ZZ_pX.pxd @@ -1,4 +1,4 @@ -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 6a1466b62d3..6b4a6b8d3f0 100644 --- a/src/sage/libs/ntl/ntl_lzz_p.pxd +++ b/src/sage/libs/ntl/ntl_lzz_p.pxd @@ -1,5 +1,5 @@ -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 cffc49f6b4c..3fd7452197d 100644 --- a/src/sage/libs/ntl/ntl_lzz_pContext.pxd +++ b/src/sage/libs/ntl/ntl_lzz_pContext.pxd @@ -1,4 +1,4 @@ -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 34176ca530e..4041f9f8f14 100644 --- a/src/sage/libs/ntl/ntl_mat_GF2.pxd +++ b/src/sage/libs/ntl/ntl_mat_GF2.pxd @@ -1,5 +1,5 @@ -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 4c7b19a066b..71d4f8b7491 100644 --- a/src/sage/libs/ntl/ntl_mat_GF2.pyx +++ b/src/sage/libs/ntl/ntl_mat_GF2.pyx @@ -40,7 +40,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 c01392b81db..15415965c66 100644 --- a/src/sage/libs/ntl/ntl_mat_GF2E.pxd +++ b/src/sage/libs/ntl/ntl_mat_GF2E.pxd @@ -1,6 +1,6 @@ -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 24f75c6c026..0588eaaa7a3 100644 --- a/src/sage/libs/ntl/ntl_mat_GF2E.pyx +++ b/src/sage/libs/ntl/ntl_mat_GF2E.pyx @@ -37,9 +37,9 @@ include 'misc.pxi' include 'decl.pxi' from cpython.object cimport Py_EQ, Py_NE -from .ntl_GF2E cimport ntl_GF2E -from .ntl_GF2EContext import ntl_GF2EContext -from .ntl_GF2EContext cimport ntl_GF2EContext_class +from sage.libs.ntl.ntl_GF2E cimport ntl_GF2E +from sage.libs.ntl.ntl_GF2EContext import ntl_GF2EContext +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 f766e82c187..472ef698704 100644 --- a/src/sage/libs/ntl/ntl_mat_ZZ.pxd +++ b/src/sage/libs/ntl/ntl_mat_ZZ.pxd @@ -1,4 +1,4 @@ -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/ntl_mat_ZZ.pyx b/src/sage/libs/ntl/ntl_mat_ZZ.pyx index 8df56b2632e..349055dc182 100644 --- a/src/sage/libs/ntl/ntl_mat_ZZ.pyx +++ b/src/sage/libs/ntl/ntl_mat_ZZ.pyx @@ -30,7 +30,7 @@ from sage.libs.ntl.ntl_ZZ cimport ntl_ZZ from sage.libs.ntl.ntl_ZZX cimport ntl_ZZX from cpython.object cimport PyObject_RichCompare -from .ntl_ZZ import unpickle_class_args +from sage.libs.ntl.ntl_ZZ import unpickle_class_args cdef inline ntl_ZZ make_ZZ(ZZ_c* x) noexcept: cdef ntl_ZZ y diff --git a/src/sage/libs/ntl/vec_GF2.pxd b/src/sage/libs/ntl/vec_GF2.pxd index fa606dc176a..81a3736b49f 100644 --- a/src/sage/libs/ntl/vec_GF2.pxd +++ b/src/sage/libs/ntl/vec_GF2.pxd @@ -1,4 +1,4 @@ -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 1cfdd7109fa..8e53bad0517 100644 --- a/src/sage/libs/ntl/vec_GF2E.pxd +++ b/src/sage/libs/ntl/vec_GF2E.pxd @@ -1 +1 @@ -from .types cimport vec_GF2E_c +from sage.libs.ntl.types cimport vec_GF2E_c