Skip to content

Commit 7d04241

Browse files
author
Matthias Koeppe
committed
Replace relative imports in Cython files
1 parent dfceb98 commit 7d04241

File tree

104 files changed

+324
-324
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

104 files changed

+324
-324
lines changed

src/sage/categories/action.pyx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ from sage.categories.map cimport Map
6363
from sage.structure.element cimport parent
6464
from sage.structure.parent cimport Parent
6565

66-
from . import homset
66+
from sage.categories import homset
6767
from weakref import ref
6868

6969

@@ -92,7 +92,7 @@ cdef class Action(Functor):
9292
:class:`Action` itself, but other classes may use it
9393
"""
9494
def __init__(self, G, S, is_left=True, op=None):
95-
from .groupoid import Groupoid
95+
from sage.categories.groupoid import Groupoid
9696
Functor.__init__(self, Groupoid(G), category(S))
9797
self.G = G
9898
self.US = ref(S)

src/sage/categories/functor.pyx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ AUTHORS:
3434
# https://www.gnu.org/licenses/
3535
# ****************************************************************************
3636

37-
from . import category
37+
from sage.categories import category
3838

3939

4040
def _Functor_unpickle(Cl, D, domain, codomain):

src/sage/categories/map.pyx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ AUTHORS:
2222
# https://www.gnu.org/licenses/
2323
# ****************************************************************************
2424

25-
from . import homset
25+
from sage.categories import homset
2626
import weakref
2727
from sage.ext.stdsage cimport HAS_DICTIONARY
2828
from sage.arith.power cimport generic_power

src/sage/categories/morphism.pyx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -468,7 +468,7 @@ cdef class CallMorphism(Morphism):
468468
cdef class IdentityMorphism(Morphism):
469469

470470
def __init__(self, parent):
471-
from .homset import Homset, Hom
471+
from sage.categories.homset import Homset, Hom
472472
if not isinstance(parent, Homset):
473473
parent = Hom(parent, parent)
474474
Morphism.__init__(self, parent)

src/sage/coding/ag_code_decoders.pyx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@ from sage.rings.function_field.constructor import FunctionField
6868
from sage.modules.free_module_element import vector
6969
from sage.matrix.constructor import matrix
7070

71-
from .encoder import Encoder
72-
from .decoder import Decoder, DecodingError
71+
from sage.coding.encoder import Encoder
72+
from sage.coding.decoder import Decoder, DecodingError
7373

7474
from sage.modules.free_module_element cimport FreeModuleElement
7575
from sage.matrix.matrix cimport Matrix

src/sage/combinat/designs/designs_pyx.pyx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -606,7 +606,7 @@ def is_quasi_difference_matrix(M,G,int k,int lmbda,int mu,int u,verbose=False):
606606
Column 1 contains 2 empty entries instead of the expected lambda.u=1.1=1
607607
False
608608
"""
609-
from .difference_family import group_law
609+
from sage.combinat.designs.difference_family import group_law
610610

611611
assert k>=2
612612
assert lmbda >=1

src/sage/combinat/designs/evenly_distributed_sets.pyx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ cdef class EvenlyDistributedSetsBacktracker:
311311
xe = self.K.multiplicative_generator() ** (self.e)
312312
df = [[xe**j*b for b in B] for j in range((self.q-1)/(2*self.e))]
313313
if check:
314-
from .difference_family import is_difference_family
314+
from sage.combinat.designs.difference_family import is_difference_family
315315
if not is_difference_family(self.K, df, self.q, self.k, 1):
316316
raise RuntimeError("a wrong evenly distributed set was "
317317
"produced by the Sage library for the parameters:\n"

src/sage/combinat/designs/orthogonal_arrays_find_recursive.pyx

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ Functions
4848
"""
4949

5050
from sage.misc.cachefunc import cached_function
51-
from .orthogonal_arrays import orthogonal_array
51+
from sage.combinat.designs.orthogonal_arrays import orthogonal_array
5252
from sage.rings.integer cimport smallInteger
5353
from sage.arith.misc import prime_powers
5454

@@ -152,7 +152,7 @@ cpdef find_product_decomposition(int k,int n):
152152
# faster to use that rather than calling the divisors function
153153
continue
154154
if is_available(k, n1) and is_available(k, n2):
155-
from .orthogonal_arrays import wilson_construction
155+
from sage.combinat.designs.orthogonal_arrays import wilson_construction
156156
return wilson_construction, (None,k,n1,n2,(),False)
157157
return False
158158

@@ -202,7 +202,7 @@ cpdef find_wilson_decomposition_with_one_truncated_group(int k,int n):
202202
is_available(k ,m+1) and
203203
is_available(k+1,r ) and
204204
is_available(k ,u )):
205-
from .orthogonal_arrays import wilson_construction
205+
from sage.combinat.designs.orthogonal_arrays import wilson_construction
206206
return wilson_construction, (None,k,r,m,(u,),False)
207207

208208
return False
@@ -265,7 +265,7 @@ cpdef find_wilson_decomposition_with_two_truncated_groups(int k,int n):
265265
r2 = r1_p_r2-r1
266266
if is_available(k,r2):
267267
assert n == r*m+r1+r2
268-
from .orthogonal_arrays import wilson_construction
268+
from sage.combinat.designs.orthogonal_arrays import wilson_construction
269269
return wilson_construction, (None,k,r,m,(r1,r2),False)
270270
return False
271271

@@ -305,7 +305,7 @@ cpdef find_construction_3_3(int k,int n):
305305

306306
if (is_available(k+i, nn ) and
307307
is_available(k , mm+i)):
308-
from .orthogonal_arrays_build_recursive import construction_3_3
308+
from sage.combinat.designs.orthogonal_arrays_build_recursive import construction_3_3
309309
return construction_3_3, (k,nn,mm,i)
310310

311311
cpdef find_construction_3_4(int k,int n):
@@ -348,7 +348,7 @@ cpdef find_construction_3_4(int k,int n):
348348
if (is_available(k+r+1,nn) and
349349
is_available(k , s) and
350350
(is_available(k,mm+r) or is_available(k,mm+r+1))):
351-
from .orthogonal_arrays_build_recursive import construction_3_4
351+
from sage.combinat.designs.orthogonal_arrays_build_recursive import construction_3_4
352352
return construction_3_4, (k,nn,mm,r,s)
353353

354354
cpdef find_construction_3_5(int k,int n):
@@ -398,7 +398,7 @@ cpdef find_construction_3_5(int k,int n):
398398
(r==0 or is_available(k,r)) and
399399
(s==0 or is_available(k,s)) and
400400
(t==0 or is_available(k,t))):
401-
from .orthogonal_arrays_build_recursive import construction_3_5
401+
from sage.combinat.designs.orthogonal_arrays_build_recursive import construction_3_5
402402
return construction_3_5, (k,nn,mm,r,s,t)
403403

404404
cpdef find_construction_3_6(int k,int n):
@@ -439,7 +439,7 @@ cpdef find_construction_3_6(int k,int n):
439439

440440
if (is_available(k+i,nn) and
441441
smallInteger(nn).is_prime_power()):
442-
from .orthogonal_arrays_build_recursive import construction_3_6
442+
from sage.combinat.designs.orthogonal_arrays_build_recursive import construction_3_6
443443
return construction_3_6, (k,nn,mm,i)
444444

445445
cpdef find_q_x(int k,int n):
@@ -491,7 +491,7 @@ cpdef find_q_x(int k,int n):
491491
# is_available(k+1,q) and
492492
is_available(k, x+2 ) and
493493
smallInteger(q).is_prime_power()):
494-
from .orthogonal_arrays_build_recursive import construction_q_x
494+
from sage.combinat.designs.orthogonal_arrays_build_recursive import construction_q_x
495495
return construction_q_x, (k,q,x)
496496
return False
497497

@@ -545,7 +545,7 @@ cpdef find_thwart_lemma_3_5(int k,int N):
545545
sage: for k,n in kn: # not tested -- too long
546546
....: assert designs.orthogonal_array(k,n,existence=True) is True
547547
"""
548-
from .orthogonal_arrays_build_recursive import thwart_lemma_3_5
548+
from sage.combinat.designs.orthogonal_arrays_build_recursive import thwart_lemma_3_5
549549
cdef int n,m,a,b,c,d,NN,na,nb,nc
550550

551551
for n in prime_powers(k+2,N-2): # There must exist a OA(k+3,n) thus n>=k+2
@@ -660,7 +660,7 @@ cpdef find_thwart_lemma_4_1(int k,int n):
660660
not is_available(k,mm+4)):
661661
continue
662662

663-
from .orthogonal_arrays_build_recursive import thwart_lemma_4_1
663+
from sage.combinat.designs.orthogonal_arrays_build_recursive import thwart_lemma_4_1
664664
return thwart_lemma_4_1,(k,nn,mm)
665665

666666
return False
@@ -705,7 +705,7 @@ cpdef find_three_factor_product(int k,int n):
705705
not is_available(k,n2) or
706706
not is_available(k,n3)):
707707
continue
708-
from .orthogonal_arrays_build_recursive import three_factor_product
708+
from sage.combinat.designs.orthogonal_arrays_build_recursive import three_factor_product
709709
return three_factor_product,(k-1,n1,n2,n3)
710710

711711
return False
@@ -730,7 +730,7 @@ cpdef find_brouwer_separable_design(int k,int n):
730730
sage: find_brouwer_separable_design(5,14)
731731
False
732732
"""
733-
from .orthogonal_arrays_build_recursive import brouwer_separable_design
733+
from sage.combinat.designs.orthogonal_arrays_build_recursive import brouwer_separable_design
734734
cdef int q,x,baer_subplane_size, max_t, min_t, t,e1,e2,e3,e4
735735

736736
for q in prime_powers(2,n):
@@ -943,7 +943,7 @@ cpdef find_brouwer_van_rees_with_one_truncated_column(int k,int n):
943943

944944
values = int_as_sum(remainder, available_multipliers, r)
945945
if values is not None:
946-
from .orthogonal_arrays import wilson_construction
946+
from sage.combinat.designs.orthogonal_arrays import wilson_construction
947947
return (wilson_construction,
948948
(None,k,r,m,[[(x,1) for x in values]]))
949949

src/sage/cpython/wrapperdescr.pyx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Pure Python classes have normal methods, not slot wrappers::
3131
# https://www.gnu.org/licenses/
3232
# ****************************************************************************
3333

34-
from .string import bytes_to_str
34+
from sage.cpython.string import bytes_to_str
3535

3636

3737
def wrapperdescr_call(slotwrapper, self, *args, **kwds):

src/sage/graphs/base/graph_backends.pyx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -723,9 +723,9 @@ cdef class GenericGraphBackend(SageObject):
723723
sage: loads(dumps(gi)) == gi
724724
True
725725
"""
726-
from .static_sparse_backend import StaticSparseBackend
727-
from .sparse_graph import SparseGraphBackend
728-
from .dense_graph import DenseGraphBackend
726+
from sage.graphs.base.static_sparse_backend import StaticSparseBackend
727+
from sage.graphs.base.sparse_graph import SparseGraphBackend
728+
from sage.graphs.base.dense_graph import DenseGraphBackend
729729

730730
# implementation, data_structure, multiedges, directed, loops
731731
if isinstance(self, CGraphBackend):

0 commit comments

Comments
 (0)