diff --git a/src/sage/matroids/constructor.py b/src/sage/matroids/constructor.py index 9a44462fed3..b964e06a40c 100644 --- a/src/sage/matroids/constructor.py +++ b/src/sage/matroids/constructor.py @@ -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 @@ -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' @@ -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: diff --git a/src/sage/modules/fg_pid/fgp_morphism.py b/src/sage/modules/fg_pid/fgp_morphism.py index 2a7e070147a..4be28f43be1 100644 --- a/src/sage/modules/fg_pid/fgp_morphism.py +++ b/src/sage/modules/fg_pid/fgp_morphism.py @@ -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