@@ -805,11 +805,11 @@ def Matroid(groundset=None, data=None, **kwds):
805805 if isinstance (data , Graph ):
806806 key = 'graph'
807807 elif isinstance (data , Matrix ) or (
808- isinstance (data , tuple ) and isinstance (data [0 ], Matrix )):
808+ isinstance (data , tuple ) and isinstance (data [0 ], Matrix )):
809809 key = 'matrix'
810810 elif isinstance (data , sage .modules .with_basis .morphism .ModuleMorphism ) or (
811- isinstance (data , tuple ) and
812- isinstance (data [0 ], sage .modules .with_basis .morphism .ModuleMorphism )):
811+ isinstance (data , tuple ) and
812+ isinstance (data [0 ], sage .modules .with_basis .morphism .ModuleMorphism )):
813813 key = 'morphism'
814814 elif isinstance (data , sage .matroids .matroid .Matroid ):
815815 key = 'matroid'
@@ -1032,11 +1032,9 @@ def revlex_sort_key(s):
10321032 subsets = sorted (combinations (range (N ), rk ), key = revlex_sort_key )
10331033 if len (data ) != len (subsets ):
10341034 raise ValueError ("expected string of length %s (%s choose %s), got %s" %
1035- (len (subsets ), N , rk , len (data )))
1036- bases = []
1037- for i , x in enumerate (data ):
1038- if x != '0' :
1039- bases .append ([groundset [c ] for c in subsets [i ]])
1035+ (len (subsets ), N , rk , len (data )))
1036+ bases = [[groundset [c ] for c in subsets [i ]]
1037+ for i , x in enumerate (data ) if x != '0' ]
10401038 M = BasisMatroid (groundset = groundset , bases = bases )
10411039
10421040 # Circuit closures:
0 commit comments