Skip to content

Commit

Permalink
Remove a is_Morphism import and adapt matroids
Browse files Browse the repository at this point in the history
Replace `is_*` with `isinstance()` in `matroids`
  • Loading branch information
gmou3 committed Jun 4, 2024
1 parent 70614f0 commit 777d42b
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
14 changes: 7 additions & 7 deletions src/sage/matroids/constructor.py
Original file line number Diff line number Diff line change
Expand Up @@ -102,9 +102,10 @@


from itertools import combinations
from sage.categories.morphism import Morphism
from sage.combinat.posets.lattices import FiniteLatticePoset
from sage.matrix.constructor import Matrix
from sage.structure.element import is_Matrix
from sage.structure.element import Matrix as matrix
from sage.rings.integer_ring import ZZ
from sage.rings.rational_field import QQ
from sage.categories.fields import Fields
Expand Down Expand Up @@ -805,12 +806,11 @@ def Matroid(groundset=None, data=None, **kwds):
Graph = ()
if isinstance(data, Graph):
key = 'graph'
elif is_Matrix(data) or (
isinstance(data, tuple) and is_Matrix(data[0])):
elif isinstance(data, matrix) or (
isinstance(data, tuple) and isinstance(data[0], matrix)):
key = 'matrix'
elif isinstance(data, sage.modules.with_basis.morphism.ModuleMorphism) or (
isinstance(data, tuple) and
isinstance(data[0], sage.modules.with_basis.morphism.ModuleMorphism)):
elif isinstance(data, Morphism) or (
isinstance(data, tuple) and isinstance(data[0], Morphism)):
key = 'morphism'
elif isinstance(data, sage.matroids.matroid.Matroid):
key = 'matroid'
Expand Down Expand Up @@ -958,7 +958,7 @@ def Matroid(groundset=None, data=None, **kwds):
A = A.matrix()

# Fix the representation
if not is_Matrix(A):
if not isinstance(A, matrix):
if base_ring is not None:
A = Matrix(base_ring, A)
else:
Expand Down
2 changes: 1 addition & 1 deletion src/sage/modules/fg_pid/fgp_morphism.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
# https://www.gnu.org/licenses/
# *************************************************************************

from sage.categories.morphism import Morphism, is_Morphism
from sage.categories.morphism import Morphism
from .fgp_module import DEBUG
from sage.structure.richcmp import richcmp, op_NE
from sage.misc.cachefunc import cached_method
Expand Down

0 comments on commit 777d42b

Please sign in to comment.