Skip to content

Commit b879fe3

Browse files
author
Release Manager
committed
Trac #32969: some better join in interfaces
by not creating the list inside URL: https://trac.sagemath.org/32969 Reported by: chapoton Ticket author(s): Frédéric Chapoton Reviewer(s): Travis Scrimshaw
2 parents 53d49b1 + 007b75b commit b879fe3

File tree

13 files changed

+50
-49
lines changed

13 files changed

+50
-49
lines changed

build/pkgs/configure/checksums.ini

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
tarball=configure-VERSION.tar.gz
2-
sha1=057437b5e5bab8926f67bd7432313de683cc63e6
3-
md5=56ad13309a61651f6bfeeec6ed49f7fb
4-
cksum=6130847
2+
sha1=e91d5d21b1f380ffc009a982d7901bcf3ecc1b9c
3+
md5=c966742e8e0366a77a701676271871d1
4+
cksum=1159564180
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
d4c93a599a2ead241667eb099f64b0bb218c3cbc
1+
cd2e194635d95e9f3d1337e842265ba9175fd797

src/sage/interfaces/gap.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1516,9 +1516,9 @@ def __getitem__(self, n):
15161516
"""
15171517
self._check_valid()
15181518
if not isinstance(n, tuple):
1519-
return self.parent().new('%s[%s]'%(self._name, n))
1520-
else:
1521-
return self.parent().new('%s%s'%(self._name, ''.join(['[%s]'%x for x in n])))
1519+
return self.parent().new('%s[%s]' % (self._name, n))
1520+
return self.parent().new('%s%s' % (self._name,
1521+
''.join('[%s]' % x for x in n)))
15221522

15231523
def str(self, use_file=False):
15241524
"""

src/sage/interfaces/gap3.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -725,9 +725,9 @@ def __getitem__(self, n):
725725
"""
726726
gap3_session = self._check_valid()
727727
if not isinstance(n, tuple):
728-
return gap3_session.new('%s[%s]'%(self.name(), n))
729-
else:
730-
return gap3_session.new('%s%s'%(self.name(), ''.join(['[%s]'%x for x in n])))
728+
return gap3_session.new('%s[%s]' % (self.name(), n))
729+
return gap3_session.new('%s%s' % (self.name(),
730+
''.join('[%s]' % x for x in n)))
731731

732732
def _latex_(self):
733733
r"""

src/sage/interfaces/lie.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -717,7 +717,7 @@ def function_call(self, function, args=None, kwds=None):
717717
# than a LiEElement
718718
if function in ['diagram', 'setdefault', 'print_tab', 'type', 'factor', 'void', 'gcol']:
719719
args, kwds = self._convert_args_kwds(args, kwds)
720-
cmd = "%s(%s)" % (function, ",".join([s.name() for s in args]))
720+
cmd = "%s(%s)" % (function, ",".join(s.name() for s in args))
721721
return AsciiArtString(self.eval(cmd))
722722

723723
return Expect.function_call(self, function, args, kwds)

src/sage/interfaces/lisp.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -381,7 +381,7 @@ def function_call(self, function, args=None, kwds=None):
381381
"""
382382
args, kwds = self._convert_args_kwds(args, kwds)
383383
self._check_valid_function_name(function)
384-
return self.new("(%s %s)"%(function, ",".join([s.name() for s in args])))
384+
return self.new("(%s %s)" % (function, ",".join(s.name() for s in args)))
385385

386386

387387
# Inherit from RingElement to make __pow__ work

src/sage/interfaces/macaulay2.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -694,7 +694,7 @@ def ideal(self, *gens):
694694
gens2.append(self(g))
695695
else:
696696
gens2.append(g)
697-
return self('ideal {%s}'%(",".join([g.name() for g in gens2])))
697+
return self('ideal {%s}' % (",".join(g.name() for g in gens2)))
698698

699699
def ring(self, base_ring='ZZ', vars='[x]', order='Lex'):
700700
r"""

src/sage/interfaces/magma.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1154,10 +1154,10 @@ def function_call(self, function, args=[], params={}, nvals=1):
11541154
if len(params) == 0:
11551155
par = ''
11561156
else:
1157-
par = ' : ' + ','.join(['%s:=%s' % (a, b.name())
1158-
for a, b in params.items()])
1157+
par = ' : ' + ','.join('%s:=%s' % (a, b.name())
1158+
for a, b in params.items())
11591159

1160-
fun = "%s(%s%s)" % (function, ",".join([s.name() for s in args]), par)
1160+
fun = "%s(%s%s)" % (function, ",".join(s.name() for s in args), par)
11611161

11621162
return self._do_call(fun, nvals)
11631163

@@ -1266,9 +1266,9 @@ def bar_call(self, left, name, gens, nvals=1):
12661266
magma = self
12671267
# coerce each arg to be a Magma element
12681268
if isinstance(gens, (list, tuple)):
1269-
gens = [magma(z) for z in gens]
1269+
gens = (magma(z) for z in gens)
12701270
# make comma separated list of names (in Magma) of each of the gens
1271-
v = ', '.join([w.name() for w in gens])
1271+
v = ', '.join(w.name() for w in gens)
12721272
else:
12731273
gens = magma(gens)
12741274
v = gens.name()

src/sage/interfaces/maxima_abstract.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -709,7 +709,7 @@ def plot2d(self, *args):
709709
710710
The eps file is saved in the current directory.
711711
"""
712-
self('plot2d(%s)'%(','.join([str(x) for x in args])))
712+
self('plot2d(%s)' % (','.join(str(x) for x in args)))
713713

714714
def plot2d_parametric(self, r, var, trange, nticks=50, options=None):
715715
r"""
@@ -780,7 +780,7 @@ def plot3d(self, *args):
780780
781781
The eps file is saved in the current working directory.
782782
"""
783-
self('plot3d(%s)'%(','.join([str(x) for x in args])))
783+
self('plot3d(%s)' % (','.join(str(x) for x in args)))
784784

785785
def plot3d_parametric(self, r, vars, urange, vrange, options=None):
786786
r"""

src/sage/interfaces/maxima_lib.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,8 @@
9191
#
9292
# The full text of the GPL is available at:
9393
#
94-
# http://www.gnu.org/licenses/
95-
#*****************************************************************************
94+
# https://www.gnu.org/licenses/
95+
# ****************************************************************************
9696

9797
from sage.symbolic.ring import SR
9898

@@ -105,8 +105,8 @@
105105
from sage.env import MAXIMA_FAS
106106

107107

108-
## We begin here by initializing Maxima in library mode
109-
## i.e. loading it into ECL
108+
# We begin here by initializing Maxima in library mode
109+
# i.e. loading it into ECL
110110
ecl_eval("(setf *load-verbose* NIL)")
111111
if MAXIMA_FAS:
112112
ecl_eval("(require 'maxima \"{}\")".format(MAXIMA_FAS))
@@ -119,7 +119,7 @@
119119
ecl_eval("(set-pathnames)")
120120
ecl_eval("(defun add-lineinfo (x) x)")
121121
ecl_eval('(defun principal nil (cond ($noprincipal (diverg)) ((not pcprntd) (merror "Divergent Integral"))))')
122-
ecl_eval("(remprop 'mfactorial 'grind)") # don't use ! for factorials (#11539)
122+
ecl_eval("(remprop 'mfactorial 'grind)") # don't use ! for factorials (#11539)
123123
ecl_eval("(setf $errormsg nil)")
124124

125125
# The following is an adaptation of the "retrieve" function in maxima
@@ -1695,7 +1695,7 @@ def max_to_sr(expr):
16951695
max_sym_dict[expr]=sage_symbol
16961696
return max_sym_dict[expr]
16971697
else:
1698-
e=expr.python()
1699-
if isinstance(e,float):
1698+
e = expr.python()
1699+
if isinstance(e, float):
17001700
return sage.rings.real_double.RealDoubleElement(e)
17011701
return e

0 commit comments

Comments
 (0)