Skip to content
This repository was archived by the owner on Jan 30, 2023. It is now read-only.

Commit 865ce70

Browse files
Frederic ChapotonFrédéric Chapoton
Frederic Chapoton
authored and
Frédéric Chapoton
committed
trac #15333 remove import of is_* in modules/all.py
1 parent 075c388 commit 865ce70

File tree

6 files changed

+17
-22
lines changed

6 files changed

+17
-22
lines changed

src/sage/modular/abvar/abvar.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
from sage.rings.all import (ZZ, QQ, QQbar, LCM,
3737
divisors, Integer, prime_range)
3838
from sage.rings.ring import is_Ring
39-
from sage.modules.all import is_FreeModule
39+
from sage.modules.free_module import is_FreeModule
4040
from sage.modular.arithgroup.all import is_CongruenceSubgroup, is_Gamma0, is_Gamma1, is_GammaH
4141
from sage.modular.modsym.all import ModularSymbols
4242
from sage.modular.modsym.space import ModularSymbolsSpace

src/sage/modular/hecke/ambient_module.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -929,14 +929,14 @@ def submodule(self, M, Mdual=None, check=True):
929929
Modular Forms subspace of dimension 2 of Modular Forms space of dimension 3 for Congruence Subgroup Gamma0(37) of weight 2 over Rational Field
930930
"""
931931
if check:
932-
if not sage.modules.all.is_FreeModule(M):
932+
if not sage.modules.free_module.is_FreeModule(M):
933933
V = self.free_module()
934934
if isinstance(M, (list,tuple)):
935935
M = V.span([V(x.element()) for x in M])
936936
else:
937937
M = V.span(M)
938938
if not M.is_submodule(self.free_module()):
939-
raise TypeError, "M must be a submodule of the free module associated to this module."
939+
raise TypeError("M must be a submodule of the free module associated to this module.")
940940
if M == self.free_module():
941941
return self
942942
return self._submodule_class()(self, M, Mdual, check=check)

src/sage/modular/hecke/submodule.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ def __init__(self, ambient, submodule, dual_free_module=None, check=True):
7979
"""
8080
if not isinstance(ambient, ambient_module.AmbientHeckeModule):
8181
raise TypeError, "ambient must be an ambient Hecke module"
82-
if not sage.modules.all.is_FreeModule(submodule):
82+
if not sage.modules.free_module.is_FreeModule(submodule):
8383
raise TypeError, "submodule must be a free module"
8484
if not submodule.is_submodule(ambient.free_module()):
8585
raise ValueError, "submodule must be a submodule of the ambient free module"
@@ -93,7 +93,7 @@ def __init__(self, ambient, submodule, dual_free_module=None, check=True):
9393
module.HeckeModule_free_module.__init__(self,
9494
ambient.base_ring(), ambient.level(), ambient.weight())
9595
if not (dual_free_module is None):
96-
if not sage.modules.all.is_FreeModule(dual_free_module):
96+
if not sage.modules.free_module.is_FreeModule(dual_free_module):
9797
raise TypeError, "dual_free_module must be a free module"
9898
if dual_free_module.rank () != submodule.rank():
9999
raise ArithmeticError, "dual_free_module must have the same rank as submodule"
@@ -896,7 +896,7 @@ def submodule(self, M, Mdual=None, check=True):
896896
sage: S.submodule(S[0].free_module())
897897
Modular Symbols subspace of dimension 2 of Modular Symbols space of dimension 18 for Gamma_0(18) of weight 4 with sign 0 over Rational Field
898898
"""
899-
if not sage.modules.all.is_FreeModule(M):
899+
if not sage.modules.free_module.is_FreeModule(M):
900900
V = self.ambient_module().free_module()
901901
if isinstance(M, (list,tuple)):
902902
M = V.span([V(x.element()) for x in M])
@@ -970,4 +970,4 @@ def hecke_bound(self):
970970
if self.is_cuspidal():
971971
return self.sturm_bound()
972972
else:
973-
return self.ambient_hecke_module().hecke_bound()
973+
return self.ambient_hecke_module().hecke_bound()

src/sage/modular/modsym/boundary.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@
103103
from sage.misc.misc import repr_lincomb
104104

105105
import sage.modules.free_module as free_module
106-
from sage.modules.all import is_FreeModuleElement
106+
from sage.modules.free_module_element import is_FreeModuleElement
107107

108108
import sage.modular.arithgroup.all as arithgroup
109109
import sage.modular.cusps as cusps

src/sage/modules/all.py

+7-13
Original file line numberDiff line numberDiff line change
@@ -13,24 +13,18 @@
1313
# http://www.gnu.org/licenses/
1414
#*****************************************************************************
1515

16-
from free_module import FreeModule, VectorSpace, span, is_FreeModule
16+
from free_module import FreeModule, VectorSpace, span
1717

18-
from free_quadratic_module import FreeQuadraticModule, QuadraticSpace, InnerProductSpace, is_FreeQuadraticModule
18+
from free_quadratic_module import (FreeQuadraticModule, QuadraticSpace,
19+
InnerProductSpace)
1920

20-
from free_module_element import is_FreeModuleElement, vector, free_module_element, zero_vector, random_vector
21+
from free_module_element import (vector, free_module_element, zero_vector,
22+
random_vector)
2123

22-
from free_module_homspace import is_FreeModuleHomspace
23-
24-
from free_module_morphism import is_FreeModuleMorphism
25-
26-
from module import is_Module, is_VectorSpace
27-
28-
from module_element import ModuleElement, is_ModuleElement
24+
from module_element import ModuleElement
2925

3026
import vector_callable_symbolic_dense
3127

32-
from vector_space_homspace import is_VectorSpaceHomspace
33-
34-
from vector_space_morphism import is_VectorSpaceMorphism, linear_transformation
28+
from vector_space_morphism import linear_transformation
3529

3630
import vector_symbolic_dense

src/sage/schemes/elliptic_curves/monsky_washnitzer.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -1737,7 +1737,8 @@ def matrix_of_frobenius(Q, p, M, trace=None, compute_exact_forms=False):
17371737
from sage.rings.laurent_series_ring import is_LaurentSeriesRing
17381738
from sage.rings.integral_domain import is_IntegralDomain
17391739

1740-
from sage.modules.all import FreeModule, is_FreeModuleElement
1740+
from sage.modules.free_module import FreeModule
1741+
from sage.modules.free_module_element import is_FreeModuleElement
17411742

17421743
from sage.misc.profiler import Profiler
17431744
from sage.misc.misc import repr_lincomb

0 commit comments

Comments
 (0)