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

Commit 4236760

Browse files
JStarxrwst
authored andcommitted
12824: Delete some deprecated is_* functions
1 parent a86cf93 commit 4236760

File tree

91 files changed

+169
-552
lines changed

Some content is hidden

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

91 files changed

+169
-552
lines changed

src/sage/categories/functor.pyx

+7-7
Original file line numberDiff line numberDiff line change
@@ -94,15 +94,15 @@ cdef class Functor(SageObject):
9494
Category of rings
9595
sage: F.codomain()
9696
Category of commutative additive groups
97-
sage: from sage.categories.functor import is_Functor
98-
sage: is_Functor(F)
97+
sage: from sage.categories.functor import Functor
98+
sage: isinstance(F, Functor)
9999
True
100100
sage: I = IdentityFunctor(abgrps)
101101
sage: I
102102
The identity functor on Category of commutative additive groups
103103
sage: I.domain()
104104
Category of commutative additive groups
105-
sage: is_Functor(I)
105+
sage: isinstance(I, Functor)
106106
True
107107
108108
Note that by default, an instance of the class Functor is coercion
@@ -174,9 +174,9 @@ cdef class Functor(SageObject):
174174
Finite Field of size 2
175175
176176
"""
177-
if not category.is_Category(domain):
177+
if not isinstance(domain, category.Category):
178178
raise TypeError, "domain (=%s) must be a category"%domain
179-
if not category.is_Category(codomain):
179+
if not isinstance(codomain, category.Category):
180180
raise TypeError, "codomain (=%s) must be a category"%codomain
181181
self.__domain = domain
182182
self.__codomain = codomain
@@ -365,8 +365,8 @@ cdef class Functor(SageObject):
365365
TypeError: Functor from Category of rings to Category of rings is ill-defined, since it sends x (=Rational Field) to something that is not in Category of rings.
366366
367367
"""
368-
from sage.categories.morphism import is_Morphism
369-
if is_Morphism(x):
368+
from sage.categories.morphism import Morphism
369+
if isinstance(x, Morphism):
370370
return self._apply_functor_to_morphism(x)
371371
y = self._apply_functor(self._coerce_into_domain(x))
372372
if not ((y in self.__codomain) or (y in self.__codomain.hom_category())):

src/sage/categories/morphism.pyx

-3
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,6 @@ def make_morphism(_class, parent, _dict, _slots):
4545
mor.__dict__ = _dict
4646
return mor
4747

48-
def is_Morphism(x):
49-
return isinstance(x, Morphism)
50-
5148
cdef class Morphism(Map):
5249

5350
def _repr_(self):

src/sage/combinat/kazhdan_lusztig.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ def __init__(self, W, q, trace=False):
8484
self._trace = trace
8585
self._one = W.one()
8686
self._base_ring = q.parent()
87-
if is_Polynomial(q):
87+
if isinstance(q, Polynomial):
8888
self._base_ring_type = "polynomial"
8989
elif isinstance(q, LaurentPolynomial_generic):
9090
self._base_ring_type = "laurent"

src/sage/combinat/sf/sfa.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -4684,7 +4684,7 @@ def _nonnegative_coefficients(x):
46844684
sage: _nonnegative_coefficients(x^2-4)
46854685
False
46864686
"""
4687-
if is_Polynomial(x) or is_MPolynomial(x):
4687+
if isinstance(x, Polynomial) or is_MPolynomial(x):
46884688
return all([ c >= 0 for c in x.coeffs() ])
46894689
else:
46904690
return x >= 0

src/sage/crypto/boolean_function.pyx

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ from sage.rings.finite_rings.constructor import GF
3434
from sage.rings.polynomial.pbori import BooleanPolynomial
3535
from sage.rings.finite_rings.constructor import is_FiniteField
3636
from sage.rings.finite_rings.finite_field_givaro import FiniteField_givaro
37-
from sage.rings.polynomial.polynomial_element import is_Polynomial
37+
from sage.rings.polynomial.polynomial_element import Polynomial
3838

3939
include "sage/misc/bitset.pxi"
4040
from cpython.string cimport *
@@ -322,7 +322,7 @@ cdef class BooleanFunction(SageObject):
322322
bitset_init(self._truth_table,(1<<self._nvariables))
323323
bitset_zero(self._truth_table)
324324

325-
elif is_Polynomial(x):
325+
elif isinstance(x, Polynomial):
326326
K = x.base_ring()
327327
if is_FiniteField(K) and K.characteristic() == 2:
328328
self._nvariables = K.degree()

src/sage/crypto/stream.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
from sage.rings.arith import power_mod
2020
from sage.rings.finite_rings.constructor import FiniteField
2121
from sage.rings.finite_rings.integer_mod_ring import IntegerModFactory
22-
from sage.rings.polynomial.polynomial_element import is_Polynomial
22+
from sage.rings.polynomial.polynomial_element import Polynomial
2323
from sage.rings.polynomial.polynomial_ring_constructor import PolynomialRing
2424

2525
IntegerModRing = IntegerModFactory("IntegerModRing")

src/sage/geometry/toric_lattice.py

+2-3
Original file line numberDiff line numberDiff line change
@@ -146,8 +146,7 @@
146146
#*****************************************************************************
147147

148148

149-
from sage.geometry.toric_lattice_element import (ToricLatticeElement,
150-
is_ToricLatticeElement)
149+
from sage.geometry.toric_lattice_element import ToricLatticeElement
151150
from sage.geometry.toric_plotter import ToricPlotter
152151
from sage.misc.all import latex, parent
153152
from sage.modules.fg_pid.fgp_element import FGP_Element
@@ -456,7 +455,7 @@ def __call__(self, *args, **kwds):
456455
coordinates = map(ZZ, args)
457456
except TypeError:
458457
# Prohibit conversion of elements of other lattices
459-
if (is_ToricLatticeElement(args[0])
458+
if (isinstance(args[0], ToricLatticeElement)
460459
and args[0].parent().ambient_module()
461460
is not self.ambient_module()):
462461
raise TypeError("%s cannot be converted to %s!"

src/sage/geometry/toric_lattice_element.pyx

+2-29
Original file line numberDiff line numberDiff line change
@@ -105,33 +105,6 @@ from sage.structure.element cimport Element, Vector
105105
from sage.rings.integer cimport Integer
106106

107107

108-
def is_ToricLatticeElement(x):
109-
r"""
110-
Check if ``x`` is an element of a toric lattice.
111-
112-
INPUT:
113-
114-
- ``x`` -- anything.
115-
116-
OUTPUT:
117-
118-
- ``True`` if ``x`` is an element of a toric lattice, ``False`` otherwise.
119-
120-
EXAMPLES::
121-
122-
sage: from sage.geometry.toric_lattice_element import (
123-
... is_ToricLatticeElement)
124-
sage: is_ToricLatticeElement(1)
125-
False
126-
sage: e = ToricLattice(3).an_element()
127-
sage: e
128-
N(1, 0, 0)
129-
sage: is_ToricLatticeElement(e)
130-
True
131-
"""
132-
return isinstance(x, ToricLatticeElement)
133-
134-
135108
# Why do we need a special class:
136109
# - customize output to include lattice name
137110
# - prohibit operations mixing "wrong" lattices
@@ -291,7 +264,7 @@ cdef class ToricLatticeElement(Vector_integer_dense):
291264
"""
292265
Ns = self.parent()
293266
# We try to deal only with the case of two lattice elements...
294-
if is_ToricLatticeElement(other):
267+
if isinstance(other, ToricLatticeElement):
295268
if other.parent().ambient_module() is Ns.ambient_module().dual():
296269
# Our own _dot_product_ is disabled
297270
return Vector_integer_dense._dot_product_(self, other)
@@ -305,7 +278,7 @@ cdef class ToricLatticeElement(Vector_integer_dense):
305278
# We also allow action on elements of lattice quotients
306279
try:
307280
lift = other.lift()
308-
if is_ToricLatticeElement(lift):
281+
if isinstance(lift, ToricLatticeElement):
309282
if other.parent().W().is_submodule(Ns.dual().W()):
310283
return Vector_integer_dense._dot_product_(self, lift)
311284
raise CoercionException("only elements of dual toric lattices "

src/sage/groups/perm_gps/permgroup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ def PermutationGroup(gens=None, gap_group=None, domain=None, canonicalize=True,
324324
...
325325
TypeError: gens must be a tuple, list, or GapElement
326326
"""
327-
if not is_ExpectElement(gens) and hasattr(gens, '_permgroup_'):
327+
if not isinstance(gens, ExpectElement) and hasattr(gens, '_permgroup_'):
328328
return gens._permgroup_()
329329
if gens is not None and not isinstance(gens, (tuple, list, GapElement)):
330330
raise TypeError("gens must be a tuple, list, or GapElement")

src/sage/groups/perm_gps/permgroup_element.pyx

+2-2
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ include "sage/ext/interrupt.pxi"
6363
from cpython.list cimport *
6464

6565
from sage.rings.all import ZZ, Integer
66-
from sage.rings.polynomial.polynomial_element import is_Polynomial
66+
from sage.rings.polynomial.polynomial_element import Polynomial
6767
from sage.rings.polynomial.multi_polynomial import is_MPolynomial
6868
from sage.matrix.matrix import is_Matrix
6969
from sage.matrix.all import MatrixSpace
@@ -837,7 +837,7 @@ cdef class PermutationGroupElement(MultiplicativeGroupElement):
837837
"""
838838
if not self_on_left:
839839
left = x
840-
if is_Polynomial(left):
840+
if isinstance(left, Polynomial):
841841
if self != 1:
842842
raise ValueError, "%s does not act on %s"%(self, left.parent())
843843
return left

src/sage/gsl/dft.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
from sage.rings.number_field.number_field import CyclotomicField
7777
from sage.plot.all import polygon, line, text
7878
from sage.groups.abelian_gps.abelian_group import AbelianGroup
79-
from sage.groups.perm_gps.permgroup_element import is_PermutationGroupElement
79+
from sage.groups.perm_gps.permgroup_element import PermutationGroupElement
8080
from sage.rings.integer_ring import ZZ
8181
from sage.rings.integer import Integer
8282
from sage.rings.arith import factor
@@ -333,7 +333,7 @@ def dft(self, chi = lambda x: x):
333333
zeta = CyclotomicField(N).gen()
334334
FT = [sum([S[i]*chi(zeta**(i*j)) for i in J]) for j in J]
335335
elif not(J[0] in ZZ) and G.is_abelian() and F == ZZ or (F.is_field() and F.base_ring()==QQ):
336-
if is_PermutationGroupElement(J[0]):
336+
if isinstance(J[0], PermutationGroupElement):
337337
## J is a CyclicPermGp
338338
n = G.order()
339339
a = list(factor(n))

src/sage/interfaces/expect.py

-3
Original file line numberDiff line numberDiff line change
@@ -1287,9 +1287,6 @@ class FunctionElement(InterfaceFunctionElement):
12871287
pass
12881288

12891289

1290-
def is_ExpectElement(x):
1291-
return isinstance(x, ExpectElement)
1292-
12931290
class ExpectElement(InterfaceElement):
12941291
"""
12951292
Expect element.

src/sage/interfaces/interface.py

-3
Original file line numberDiff line numberDiff line change
@@ -602,9 +602,6 @@ def _sage_doc_(self):
602602

603603

604604

605-
def is_InterfaceElement(x):
606-
return isinstance(x, InterfaceElement)
607-
608605
class InterfaceElement(RingElement):
609606
"""
610607
Interface element.

src/sage/interfaces/kash.py

-3
Original file line numberDiff line numberDiff line change
@@ -684,9 +684,6 @@ def __repr__(self):
684684
return '\n'.join(self)
685685

686686

687-
def is_KashElement(x):
688-
return isinstance(x, KashElement)
689-
690687
############
691688

692689
###########

src/sage/interfaces/macaulay2.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
-- William Stein (2006-02-09): fixed bug in reading from file and
7070
improved output cleaning.
7171
-- Kiran Kedlaya (2006-02-12): added ring and ideal constructors,
72-
list delimiters, is_Macaulay2Element, sage_polystring,
72+
list delimiters, Macaulay2Element, sage_polystring,
7373
__floordiv__, __mod__, __iter__, __len__; stripped extra
7474
leading space and trailing newline from output.
7575

src/sage/matrix/action.pyx

+3-3
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,13 @@ AUTHOR:
5050

5151
import operator
5252

53-
from matrix_space import MatrixSpace, is_MatrixSpace
53+
from matrix_space import MatrixSpace
5454
from sage.modules.free_module import FreeModule, is_FreeModule
5555

5656

5757
cdef class MatrixMulAction(Action):
5858
def __init__(self, G, S, is_left):
59-
if not is_MatrixSpace(G):
59+
if not isinstance(G, MatrixSpace):
6060
raise TypeError, "Not a matrix space: %s" % G
6161
if G.base_ring() is not S.base_ring():
6262
from sage.categories.pushout import pushout
@@ -136,7 +136,7 @@ cdef class MatrixMatrixAction(MatrixMulAction):
136136
example is good practice.
137137
138138
"""
139-
if not is_MatrixSpace(S):
139+
if not isinstance(S, MatrixSpace):
140140
raise TypeError, "Not a matrix space: %s" % S
141141
MatrixMulAction.__init__(self, G, S, True)
142142

src/sage/matrix/constructor.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -2071,7 +2071,7 @@ def elementary_matrix(arg0, arg1=None, **kwds):
20712071
R = arg0
20722072
arg0 = arg1
20732073
elif scale is not None:
2074-
if not sage.structure.element.is_RingElement(scale):
2074+
if not isinstance(scale, sage.structure.element.RingElement):
20752075
raise TypeError('scale must be an element of some ring, not {0}'.format(scale))
20762076
R = scale.parent()
20772077
else:

src/sage/matrix/matrix_integer_dense.pyx

+2-2
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ from sage.modules.vector_integer_dense cimport Vector_integer_dense
5353
from sage.misc.misc import verbose, get_verbose, cputime
5454

5555
from sage.rings.arith import previous_prime
56-
from sage.structure.element import is_Element
56+
from sage.structure.element import Element
5757
from sage.structure.proof.proof import get_flag as get_proof_flag
5858

5959
from sage.matrix.matrix_rational_dense cimport Matrix_rational_dense
@@ -394,7 +394,7 @@ cdef class Matrix_integer_dense(matrix_dense.Matrix_dense): # dense or sparse
394394
if entries is None:
395395
x = ZZ(0)
396396
is_list = 0
397-
elif isinstance(entries, (int,long)) or is_Element(entries):
397+
elif isinstance(entries, (int,long)) or isinstance(entries, Element):
398398
try:
399399
x = ZZ(entries)
400400
except TypeError:

src/sage/misc/functional.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1459,9 +1459,9 @@ def numerical_approx(x, prec=None, digits=None, algorithm=None):
14591459
try:
14601460
return x._numerical_approx(prec, algorithm=algorithm)
14611461
except AttributeError:
1462-
from sage.rings.complex_double import is_ComplexDoubleElement
1462+
from sage.rings.complex_double import ComplexDoubleElement
14631463
from sage.rings.complex_number import is_ComplexNumber
1464-
if not (is_ComplexNumber(x) or is_ComplexDoubleElement(x)):
1464+
if not (is_ComplexNumber(x) or isinstance(x, ComplexDoubleElement)):
14651465
try:
14661466
return sage.rings.real_mpfr.RealField(prec)(x)
14671467
# Trac 10761: now catches ValueErrors as well as TypeErrors

src/sage/misc/sage_input.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -3290,8 +3290,8 @@ def verify_same(a, b):
32903290
assert(a.parent() == b.parent())
32913291
AssertionError
32923292
"""
3293-
from sage.structure.element import is_Element
3294-
if is_Element(a):
3293+
from sage.structure.element import Element
3294+
if isinstance(a, Element):
32953295
assert(a.parent() == b.parent())
32963296
else:
32973297
assert(isinstance(a, type(b)))

src/sage/modular/abvar/constructor.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
from sage.rings.integer import Integer
1818

1919
from sage.modular.arithgroup.all import is_CongruenceSubgroup, Gamma0
20-
from sage.modular.modsym.space import is_ModularSymbolsSpace
20+
from sage.modular.modsym.space import ModularSymbolsSpace
2121
from abvar_newform import ModularAbelianVariety_newform
2222
import sage.modular.modform.element
2323
import abvar
@@ -182,7 +182,7 @@ def AbelianVariety(X):
182182
elif isinstance(X, sage.modular.modform.element.Newform):
183183
return ModularAbelianVariety_newform(X)
184184

185-
if is_ModularSymbolsSpace(X):
185+
if isinstance(X, ModularSymbolsSpace):
186186
return abvar.ModularAbelianVariety_modsym(X)
187187

188188
if isinstance(X, (tuple,list)) and all([is_CongruenceSubgroup(G) for G in X]):

src/sage/modular/arithgroup/all.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Note: the is_xxx functions are imported to here, but not from here up to sage.modular.all, so
22
# they are invisible to the user but easy to import all in one go by other code that needs them.
33

4-
from arithgroup_generic import is_ArithmeticSubgroup
4+
from arithgroup_generic import ArithmeticSubgroup
55
from congroup_generic import is_CongruenceSubgroup, CongruenceSubgroup_constructor as CongruenceSubgroup
66
from congroup_gammaH import GammaH_constructor as GammaH, is_GammaH
77
from congroup_gamma1 import Gamma1_constructor as Gamma1, is_Gamma1

src/sage/modular/arithgroup/arithgroup_generic.py

-16
Original file line numberDiff line numberDiff line change
@@ -29,22 +29,6 @@
2929

3030
from arithgroup_element import ArithmeticSubgroupElement
3131

32-
def is_ArithmeticSubgroup(x):
33-
r"""
34-
Return True if x is of type ArithmeticSubgroup.
35-
36-
EXAMPLE::
37-
38-
sage: from sage.modular.arithgroup.all import is_ArithmeticSubgroup
39-
sage: is_ArithmeticSubgroup(GL(2, GF(7)))
40-
False
41-
sage: is_ArithmeticSubgroup(Gamma0(4))
42-
True
43-
"""
44-
45-
return isinstance(x, ArithmeticSubgroup)
46-
47-
4832
class ArithmeticSubgroup(group.Group):
4933
r"""
5034
Base class for arithmetic subgroups of `{\rm SL}_2(\ZZ)`. Not

0 commit comments

Comments
 (0)