some better join() in interfaces

Author: fchapoton

src/sage/interfaces/gap.py

@@ -1516,9 +1516,9 @@ def __getitem__(self, n):
         """
         self._check_valid()
         if not isinstance(n, tuple):
-            return self.parent().new('%s[%s]'%(self._name, n))
-        else:
-            return self.parent().new('%s%s'%(self._name, ''.join(['[%s]'%x for x in n])))
+            return self.parent().new('%s[%s]' % (self._name, n))
+        return self.parent().new('%s%s' % (self._name,
+                                           ''.join('[%s]' % x for x in n)))
 
     def str(self, use_file=False):
         """

src/sage/interfaces/gap3.py

@@ -725,9 +725,9 @@ def __getitem__(self, n):
         """
         gap3_session = self._check_valid()
         if not isinstance(n, tuple):
-            return gap3_session.new('%s[%s]'%(self.name(), n))
-        else:
-            return gap3_session.new('%s%s'%(self.name(), ''.join(['[%s]'%x for x in n])))
+            return gap3_session.new('%s[%s]' % (self.name(), n))
+        return gap3_session.new('%s%s' % (self.name(),
+                                          ''.join('[%s]' % x for x in n)))
 
     def _latex_(self):
         r"""

src/sage/interfaces/lie.py

@@ -717,7 +717,7 @@ def function_call(self, function, args=None, kwds=None):
         # than a LiEElement
         if function in ['diagram', 'setdefault', 'print_tab', 'type', 'factor', 'void', 'gcol']:
             args, kwds = self._convert_args_kwds(args, kwds)
-            cmd = "%s(%s)" % (function, ",".join([s.name() for s in args]))
+            cmd = "%s(%s)" % (function, ",".join(s.name() for s in args))
             return AsciiArtString(self.eval(cmd))
 
         return Expect.function_call(self, function, args, kwds)

src/sage/interfaces/lisp.py

@@ -381,7 +381,7 @@ def function_call(self, function, args=None, kwds=None):
         """
         args, kwds = self._convert_args_kwds(args, kwds)
         self._check_valid_function_name(function)
-        return self.new("(%s %s)"%(function, ",".join([s.name() for s in args])))
+        return self.new("(%s %s)" % (function, ",".join(s.name() for s in args)))
 
 
 # Inherit from RingElement to make __pow__ work

src/sage/interfaces/macaulay2.py

@@ -694,7 +694,7 @@ def ideal(self, *gens):
                 gens2.append(self(g))
             else:
                 gens2.append(g)
-        return self('ideal {%s}'%(",".join([g.name() for g in gens2])))
+        return self('ideal {%s}' % (",".join(g.name() for g in gens2)))
 
     def ring(self, base_ring='ZZ', vars='[x]', order='Lex'):
         r"""

src/sage/interfaces/magma.py

@@ -1154,10 +1154,10 @@ def function_call(self, function, args=[], params={}, nvals=1):
         if len(params) == 0:
             par = ''
         else:
-            par = ' : ' + ','.join(['%s:=%s' % (a, b.name())
-                                    for a, b in params.items()])
+            par = ' : ' + ','.join('%s:=%s' % (a, b.name())
+                                   for a, b in params.items())
 
-        fun = "%s(%s%s)" % (function, ",".join([s.name() for s in args]), par)
+        fun = "%s(%s%s)" % (function, ",".join(s.name() for s in args), par)
 
         return self._do_call(fun, nvals)
 
@@ -1266,9 +1266,9 @@ def bar_call(self, left, name, gens, nvals=1):
         magma = self
         # coerce each arg to be a Magma element
         if isinstance(gens, (list, tuple)):
-            gens = [magma(z) for z in gens]
+            gens = (magma(z) for z in gens)
             # make comma separated list of names (in Magma) of each of the gens
-            v = ', '.join([w.name() for w in gens])
+            v = ', '.join(w.name() for w in gens)
         else:
             gens = magma(gens)
             v = gens.name()

src/sage/interfaces/maxima_abstract.py

@@ -708,7 +708,7 @@ def plot2d(self, *args):
 
         The eps file is saved in the current directory.
         """
-        self('plot2d(%s)'%(','.join([str(x) for x in args])))
+        self('plot2d(%s)' % (','.join(str(x) for x in args)))
 
     def plot2d_parametric(self, r, var, trange, nticks=50, options=None):
         r"""
@@ -779,7 +779,7 @@ def plot3d(self, *args):
 
         The eps file is saved in the current working directory.
         """
-        self('plot3d(%s)'%(','.join([str(x) for x in args])))
+        self('plot3d(%s)' % (','.join(str(x) for x in args)))
 
     def plot3d_parametric(self, r, vars, urange, vrange, options=None):
         r"""

src/sage/interfaces/maxima_lib.py

@@ -453,7 +453,7 @@ def _eval_line(self, line, locals=None, reformat=True, **kwds):
                     maxima_eval("#$%s$" % statement)
         if not reformat:
             return result
-        return ''.join([x.strip() for x in result.split()])
+        return ''.join(x.strip() for x in result.split())
 
     eval = _eval_line
 

src/sage/interfaces/qsieve.py

@@ -116,7 +116,7 @@ def data_to_list(out, n, time):
                 break
         if i < len(w):
             t = w[i].strip()
-            out = '\n'.join([w[j] for j in range(i)])
+            out = '\n'.join(w[j] for j in range(i))
         else:
             t = ''
     else:

src/sage/interfaces/rubik.py

@@ -154,17 +154,17 @@ def solve(self, facets):
         self.ready()
         self.child.sendline(self.format_cube(facets))
         self.child.expect(r"([LRUDBF'2 ]+)\s+\((\d+)q\*?, (\d+)f\*?\)")
-        self.child.sendline(chr(3)) # send ctrl-c
+        self.child.sendline(chr(3))  # send ctrl-c
         return bytes_to_str(self.child.match.groups()[0]).strip()
 
     def format_cube(self, facets):
         L = []
         optimal_solver_list = [SingNot(x) for x in optimal_solver_tokens]
         for f in optimal_solver_format.split(" "):
-            ix = facets[singmaster_list.index(SingNot(f))-1]
+            ix = facets[singmaster_list.index(SingNot(f)) - 1]
             facet = singmaster_list[ix]
             L.append(optimal_solver_list[optimal_solver_list.index(facet)])
-        return " ".join([str(f) for f in L])
+        return " ".join(str(f) for f in L)
 
 
 move_map = {
@@ -287,7 +287,8 @@ def solve(self, facets, timeout=10, extra_time=2):
             # format the string into our notation
             child.close(True)
             sol = bytes_to_str(sol)
-            return ' '.join([self.rot_map[m[0]]+str(4-int(m[1])) for m in reversed(sol.split(' '))]).replace('1', '').replace('3',"'")
+            return ' '.join(self.rot_map[m[0]] + str(4 - int(m[1]))
+                            for m in reversed(sol.split(' '))).replace('1', '').replace('3', "'")
         elif ix == 1:
             # invalid format
             child.close(True)