@@ -953,7 +953,7 @@ def random_vector(ring, degree=None, *args, **kwds):
953953 if ring not in Rings():
954954 raise TypeError (" elements of a vector, or module element, must come from a ring, not %s " % ring)
955955 if not hasattr (ring, " random_element" ):
956- raise AttributeError (" cannot create a random vector since there is no random_element() method for %s " % ring )
956+ raise AttributeError (" cannot create a random vector since there is no random_element() method for %s " % ring)
957957 sparse = kwds.pop(' sparse' , False )
958958 entries = [ring.random_element(* args, ** kwds) for _ in range (degree)]
959959 return vector(ring, degree, entries, sparse)
@@ -1290,16 +1290,15 @@ cdef class FreeModuleElement(Vector): # abstract base class
12901290 # on the elements, which is sometimes much prettier than
12911291 # the coerced=False we would get otherwise.
12921292 if self .is_sparse_c():
1293- items = [(n, sib(e, 2 ))
1294- for n,e in self .dict().items()]
1293+ items = [(n, sib(e, 2 )) for n, e in self .dict().items()]
12951294 items.sort()
12961295 if len (self ):
12971296 # we may need to add an extra element on the end to
12981297 # set the size. (There doesn't seem to be a better way
12991298 # to do it.)
1300- if len (items) == 0 or len (self )- 1 > items[- 1 ][0 ]:
1299+ if not items or len (self )- 1 > items[- 1 ][0 ]:
13011300 items.append((len (self )- 1 , sib.int(0 )))
1302- items_dict = sib.dict([(sib.int(n), e) for n,e in items])
1301+ items_dict = sib.dict([(sib.int(n), e) for n, e in items])
13031302
13041303 return sib.name(' vector' )(self .base_ring(), items_dict)
13051304 else :
@@ -1508,7 +1507,7 @@ cdef class FreeModuleElement(Vector): # abstract base class
15081507 """
15091508 from sage.matrix.args import MatrixArgs
15101509 ma = MatrixArgs(self ._parent._base, 1 , self .degree(),
1511- list (self ), sparse = self .is_sparse())
1510+ list (self ), sparse = self .is_sparse())
15121511 return ma.matrix()
15131512
15141513 def column (self ):
@@ -1580,7 +1579,7 @@ cdef class FreeModuleElement(Vector): # abstract base class
15801579 """
15811580 from sage.matrix.args import MatrixArgs
15821581 ma = MatrixArgs(self ._parent._base, self .degree(), 1 ,
1583- [(x,) for x in self ], sparse = self .is_sparse())
1582+ [(x,) for x in self ], sparse = self .is_sparse())
15841583 return ma.matrix()
15851584
15861585 def __copy__ (self ):
@@ -1622,7 +1621,7 @@ cdef class FreeModuleElement(Vector): # abstract base class
16221621 sage: v.subs(a=b, b=d)
16231622 (b, d, d, e)
16241623 """
1625- return self .parent()([ a.subs(in_dict, ** kwds) for a in self .list() ])
1624+ return self .parent()([a.subs(in_dict, ** kwds) for a in self .list()])
16261625
16271626 def change_ring (self , R ):
16281627 """
@@ -2481,7 +2480,9 @@ cdef class FreeModuleElement(Vector): # abstract base class
24812480 from sage.plot.plot3d.shapes2 import line3d, point3d
24822481
24832482 if plot_type == ' arrow' :
2484- return line3d([start, [(u+ v) for u,v in zip (coords, start)]], arrow_head = True , ** kwds)
2483+ return line3d([start,
2484+ [(u+ v) for u, v in zip (coords, start)]],
2485+ arrow_head = True , ** kwds)
24852486 else :
24862487 return point3d(coords, ** kwds)
24872488 elif dimension < 3 :
@@ -2492,7 +2493,8 @@ cdef class FreeModuleElement(Vector): # abstract base class
24922493
24932494 from sage.plot.all import arrow, point
24942495 if plot_type == ' arrow' :
2495- return arrow(start, [(u+ v) for u,v in zip (coords, start)], ** kwds)
2496+ return arrow(start,
2497+ [(u+ v) for u, v in zip (coords, start)], ** kwds)
24962498 else :
24972499 return point(coords, ** kwds)
24982500 else :
@@ -2504,7 +2506,7 @@ cdef class FreeModuleElement(Vector): # abstract base class
25042506 raise NotImplementedError (" plot_type was unrecognized" )
25052507
25062508 def plot_step (self , xmin = 0 , xmax = 1 , eps = None , res = None ,
2507- connect = True , **kwds ):
2509+ connect = True , **kwds ):
25082510 r """
25092511 INPUT:
25102512
@@ -2542,9 +2544,9 @@ cdef class FreeModuleElement(Vector): # abstract base class
25422544 y = float (self [i])
25432545 if x > xmax:
25442546 break
2545- v.append((x,y))
2547+ v.append((x, y))
25462548 x += eps
2547- v.append((x,y))
2549+ v.append((x, y))
25482550 from sage.plot.all import line, points
25492551 if connect:
25502552 return line(v, ** kwds)
@@ -2885,9 +2887,9 @@ cdef class FreeModuleElement(Vector): # abstract base class
28852887 MS = MatrixSpace(R, rank, rank, sparse = self .is_sparse())
28862888 s = self .list(copy = False )
28872889 return MS([
2888- [ zero, - s[2 ], s[1 ]],
2889- [ s[2 ], zero, - s[0 ]],
2890- [- s[1 ], s[0 ], zero]])
2890+ [zero, - s[2 ], s[1 ]],
2891+ [s[2 ], zero, - s[0 ]],
2892+ [- s[1 ], s[0 ], zero]])
28912893 elif rank == 7 :
28922894 MS = MatrixSpace(R, rank, rank, sparse = self .is_sparse())
28932895 s = self .list(copy = False )
@@ -4031,16 +4033,16 @@ cdef class FreeModuleElement(Vector): # abstract base class
40314033 zero_res = 0
40324034 if len(self.dict(copy=False)) < self._degree:
40334035 # OK, we have some zero entries.
4034- zero_res = phi(self.base_ring()(0 ))
4036+ zero_res = phi(self.base_ring().zero( ))
40354037 if not zero_res.is_zero():
40364038 # And phi maps 0 to a nonzero value.
40374039 v = [zero_res] * self._degree
4038- for i,z in self.dict(copy=False).items():
4040+ for i, z in self.dict(copy=False).items():
40394041 v[i] = phi(z)
40404042
40414043 if v is None:
40424044 # phi maps 0 to 0 (or else we don't have any zeroes at all)
4043- v = dict([(i, phi(z)) for i,z in self.dict(copy=False).items()])
4045+ v = {i: phi(z) for i, z in self.dict(copy=False).items()}
40444046 # add a zero at the last position, if it is not already set.
40454047 # This will help the constructor to determine the right degree.
40464048 v.setdefault(self._degree-1, zero_res)
@@ -4189,14 +4191,14 @@ cdef class FreeModuleElement(Vector): # abstract base class
41894191 # return self.apply_map(lambda x: x.nintegral(*args, **kwds) for x in self)
41904192
41914193 if self.is_sparse():
4192- v = [(i, z.nintegral(*args, **kwds)) for i,z in self.dict(copy=False).items()]
4193- answers = dict([(i,a[0]) for i,a in v])
4194- v=dict(v)
4194+ v = {i: z.nintegral(*args, **kwds)
4195+ for i, z in self.dict(copy=False).items()}
4196+ answers = {i: a[0] for i, a in v.items()}
41954197 else:
41964198 v = [z.nintegral(*args, **kwds) for z in self.list()]
41974199 answers = [a[0] for a in v]
41984200
4199- return (vector(answers,sparse=self.is_sparse()), v)
4201+ return (vector(answers, sparse=self.is_sparse()), v)
42004202
42014203 nintegrate = nintegral
42024204
@@ -5518,4 +5520,4 @@ cdef class FreeModuleElement_generic_sparse(FreeModuleElement):
55185520 if prec is None:
55195521 prec = digits_to_bits(digits)
55205522 return vector({k: v.numerical_approx(prec, algorithm=algorithm)
5521- for k, v in self._entries.iteritems()}, sparse=True)
5523+ for k, v in self._entries.iteritems()}, sparse=True)
0 commit comments