black weirdness wars (#1015)

rocky · web-flow · commit 959935eb4aff · 2024-03-02T16:16:30.000-05:00
In some versions, black seems to want optional "," at the end of the last parameter. In support of getting #1013 to build cleanly
diff --git a/mathics/builtin/colors/color_operations.py b/mathics/builtin/colors/color_operations.py
@@ -454,7 +454,7 @@ def result():
                         yield to_expression(
                             Symbol(out_palette_head),
                             *prototype,
-                            elements_conversion_fn=MachineReal
+                            elements_conversion_fn=MachineReal,
                         )
 
         return to_mathics_list(*itertools.islice(result(), 0, at_most))
diff --git a/mathics/builtin/drawing/plot.py b/mathics/builtin/drawing/plot.py
@@ -654,7 +654,7 @@ def eval(
             functions,
             xexpr_limits,
             yexpr_limits,
-            *options_to_rules(options)
+            *options_to_rules(options),
         )
 
         functions = self.get_functions_param(functions)
@@ -1501,7 +1501,7 @@ def final_graphics(self, graphics, options):
         return Expression(
             SymbolGraphics,
             ListExpression(*graphics),
-            *options_to_rules(options, Graphics.options)
+            *options_to_rules(options, Graphics.options),
         )
 
 
@@ -1936,7 +1936,7 @@ def auto_bins():
         return Expression(
             SymbolGraphics,
             ListExpression(*graphics),
-            *options_to_rules(options, Graphics.options)
+            *options_to_rules(options, Graphics.options),
         )
 
 
@@ -2622,5 +2622,5 @@ def final_graphics(self, graphics, options: dict):
         return Expression(
             SymbolGraphics3D,
             ListExpression(*graphics),
-            *options_to_rules(options, Graphics3D.options)
+            *options_to_rules(options, Graphics3D.options),
         )
diff --git a/mathics/builtin/fileformats/htmlformat.py b/mathics/builtin/fileformats/htmlformat.py
@@ -80,7 +80,7 @@ def xml_object(tree):
     return Expression(
         Expression(SymbolXMLObject, String("Document")),
         to_mathics_list(*declaration),
-        *node_to_xml_element(tree.getroot())
+        *node_to_xml_element(tree.getroot()),
     )
 
 
diff --git a/mathics/builtin/fileformats/xmlformat.py b/mathics/builtin/fileformats/xmlformat.py
@@ -143,7 +143,7 @@ def xml_object(root):
     return Expression(
         to_expression("XMLObject", String("Document")),
         to_mathics_list(*declaration),
-        *node_to_xml_element(root)
+        *node_to_xml_element(root),
     )
 
 
diff --git a/mathics/builtin/files_io/importexport.py b/mathics/builtin/files_io/importexport.py
@@ -1825,7 +1825,7 @@ def eval_elements(self, filename, expr, elems, evaluation, options={}):
                 exporter_symbol,
                 filename,
                 expr,
-                *list(chain(stream_options, custom_options))
+                *list(chain(stream_options, custom_options)),
             )
             res = exporter_function.evaluate(evaluation)
         elif function_channels == ListExpression(String("Streams")):
@@ -1840,7 +1840,7 @@ def eval_elements(self, filename, expr, elems, evaluation, options={}):
                 exporter_symbol,
                 stream,
                 expr,
-                *list(chain(stream_options, custom_options))
+                *list(chain(stream_options, custom_options)),
             )
             res = exporter_function.evaluate(evaluation)
             Expression(SymbolClose, stream).evaluate(evaluation)
@@ -1967,7 +1967,7 @@ def eval_elements(self, expr, elems, evaluation: Evaluation, **options):
                 exporter_symbol,
                 filename,
                 expr,
-                *list(chain(stream_options, custom_options))
+                *list(chain(stream_options, custom_options)),
             )
             exportres = exporter_function.evaluate(evaluation)
             if exportres != SymbolNull:
@@ -2013,7 +2013,7 @@ def eval_elements(self, expr, elems, evaluation: Evaluation, **options):
                 exporter_symbol,
                 outstream,
                 expr,
-                *list(chain(stream_options, custom_options))
+                *list(chain(stream_options, custom_options)),
             )
             res = exporter_function.evaluate(evaluation)
             if res is SymbolNull:
diff --git a/mathics/builtin/inference.py b/mathics/builtin/inference.py
@@ -359,7 +359,7 @@ def evaluate_predicate(pred, evaluation):
     if pred.has_form(("List", "Sequence"), None):
         return Expression(
             pred._head,
-            *[evaluate_predicate(subp, evaluation) for subp in pred.elements]
+            *[evaluate_predicate(subp, evaluation) for subp in pred.elements],
         )
 
     debug_logical_expr("reducing ", pred, evaluation)
diff --git a/mathics/builtin/numbers/algebra.py b/mathics/builtin/numbers/algebra.py
@@ -845,7 +845,7 @@ def eval_list(self, polys, varlist, evaluation: Evaluation, options: dict):
                             SymbolTable,
                             Integer(0),
                             ListExpression(Integer(dim1)),
-                            *its2
+                            *its2,
                         )
                     else:
                         newtable = Expression(SymbolTable, Integer(0), *its2)
@@ -952,7 +952,7 @@ def eval(self, expr, form, evaluation):
                             self.__class__.__name__, expr, form, Integer(n), evaluation
                         )
                         for n in range(dimensions[0] + 1)
-                    ]
+                    ],
                 )
             elif form.has_form("List", 1):
                 form = form.elements[0]
@@ -963,7 +963,7 @@ def eval(self, expr, form, evaluation):
                             self.__class__.__name__, expr, form, Integer(n), evaluation
                         )
                         for n in range(dimensions[0] + 1)
-                    ]
+                    ],
                 )
             else:
 
diff --git a/mathics/builtin/numbers/diffeqns.py b/mathics/builtin/numbers/diffeqns.py
@@ -160,7 +160,7 @@ def eval(self, eqn, y, x, evaluation: Evaluation):
                             Expression(
                                 SymbolFunction,
                                 function_form,
-                                *from_sympy(soln).elements[1:]
+                                *from_sympy(soln).elements[1:],
                             ),
                         ),
                     )
diff --git a/mathics/builtin/patterns.py b/mathics/builtin/patterns.py
@@ -1119,7 +1119,7 @@ def match(
         head=None,
         element_index=None,
         element_count=None,
-        **kwargs
+        **kwargs,
     ):
         if expression.has_form("Sequence", 0):
             if self.default is None:
@@ -1231,7 +1231,7 @@ def match(
         expression: Expression,
         vars: dict,
         evaluation: Evaluation,
-        **kwargs
+        **kwargs,
     ):
         if not expression.has_form("Sequence", 0):
             if self.head is not None:
@@ -1286,7 +1286,7 @@ def match(
         expression: Expression,
         vars: dict,
         evaluation: Evaluation,
-        **kwargs
+        **kwargs,
     ):
         elements = expression.get_sequence()
         if not elements:
@@ -1335,7 +1335,7 @@ def match(
         expression: Expression,
         vars: dict,
         evaluation: Evaluation,
-        **kwargs
+        **kwargs,
     ):
         elements = expression.get_sequence()
         if self.head:
@@ -1553,7 +1553,7 @@ def match(
         expression: Expression,
         vars: dict,
         evaluation: Evaluation,
-        **kwargs
+        **kwargs,
     ):
         # for new_vars, rest in self.pattern.match(expression, vars,
         # evaluation):
@@ -1626,7 +1626,7 @@ def match(
         expression: Expression,
         vars: dict,
         evaluation: Evaluation,
-        **kwargs
+        **kwargs,
     ):
         if self.defaults is None:
             self.defaults = kwargs.get("head")
diff --git a/mathics/builtin/pympler/asizeof.py b/mathics/builtin/pympler/asizeof.py
@@ -2390,7 +2390,7 @@ def print_largest(self, w=0, cutoff=0, **print3options):
                 self._ranked,
                 s,
                 _SI(s),
-                **print3options
+                **print3options,
             )
             id2x = dict((r.id, i) for i, r in enumerate(self._ranks))
             for r in self._ranks[:n]:
@@ -2428,7 +2428,7 @@ def print_profiles(self, w=0, cutoff=0, **print3options):
                 _plural(len(t)),
                 s,
                 self._incl,
-                **print3options
+                **print3options,
             )
             r = len(t)
             for v, k in sorted(t, reverse=True):
@@ -2498,7 +2498,7 @@ def print_stats(
                         _SI(z),
                         self._incl,
                         self._repr(o),
-                        **print3options
+                        **print3options,
                     )
             else:
                 if objs:
@@ -2531,7 +2531,7 @@ def print_summary(self, w=0, objs=(), **print3options):
             self._total,
             _SI(self._total),
             self._incl,
-            **print3options
+            **print3options,
         )
         if self._mask:
             self._printf("%*d byte aligned", w, self._mask + 1, **print3options)
@@ -2581,7 +2581,7 @@ def print_typedefs(self, w=0, **print3options):
                     len(t),
                     k,
                     _plural(len(t)),
-                    **print3options
+                    **print3options,
                 )
                 for a, v in sorted(t):
                     self._printf("%*s %s:  %s", w, "", a, v, **print3options)
@@ -2612,7 +2612,7 @@ def reset(
         limit=100,
         stats=0,
         stream=None,
-        **extra
+        **extra,
     ):
         """Reset sizing options, state, etc. to defaults.
 
diff --git a/mathics/core/convert/expression.py b/mathics/core/convert/expression.py
@@ -21,7 +21,7 @@ def make_expression(head, *elements, **kwargs) -> Expression:
 def to_expression(
     head: Union[str, Symbol],
     *elements: Any,
-    elements_conversion_fn: Callable = from_python
+    elements_conversion_fn: Callable = from_python,
 ) -> Expression:
     """
     This is an expression constructor that can be used when the Head and elements are not Mathics
@@ -45,14 +45,14 @@ def to_expression(
         head,
         *elements_tuple,
         elements_properties=elements_properties,
-        literal_values=literal_values
+        literal_values=literal_values,
     )
 
 
 def to_expression_with_specialization(
     head: Union[str, Symbol],
     *elements: Any,
-    elements_conversion_fn: Callable = from_python
+    elements_conversion_fn: Callable = from_python,
 ) -> Union[ListExpression, Expression]:
     """
     This expression constructor will figure out what the right kind of
diff --git a/mathics/core/pattern.py b/mathics/core/pattern.py
@@ -783,7 +783,7 @@ def match_element(
                     candidates,
                     included=element_candidates,
                     less_first=less_first,
-                    *set_lengths
+                    *set_lengths,
                 )
         else:
             # a generator that yields partitions of
@@ -794,7 +794,7 @@ def match_element(
                 flexible_start=first and not fully,
                 included=element_candidates,
                 less_first=less_first,
-                *set_lengths
+                *set_lengths,
             )
         if rest_elements:
             next_element = rest_elements[0]
diff --git a/mathics/core/rules.py b/mathics/core/rules.py
@@ -81,7 +81,7 @@ def yield_match(vars, rest):
             if rest[0] or rest[1]:
                 result = Expression(
                     expression.get_head(),
-                    *list(chain(rest[0], [new_expression], rest[1]))
+                    *list(chain(rest[0], [new_expression], rest[1])),
                 )
             else:
                 result = new_expression
diff --git a/mathics/core/subexpression.py b/mathics/core/subexpression.py
@@ -289,7 +289,7 @@ def elements(self, value):
     def to_expression(self):
         return Expression(
             self._headp.to_expression(),
-            *(element.to_expression() for element in self._elementsp)
+            *(element.to_expression() for element in self._elementsp),
         )
 
     def replace(self, new):
diff --git a/mathics/eval/numbers/calculus/series.py b/mathics/eval/numbers/calculus/series.py
@@ -400,7 +400,7 @@ def build_series(f, x, x0, n, evaluation):
                 *[
                     build_series(element, x, x0, Integer(n), evaluation)
                     for element in f.elements
-                ]
+                ],
             )
         data.append(newcoeff)
     data = ListExpression(*data).evaluate(evaluation)
diff --git a/test/core/test_expression_constructor.py b/test/core/test_expression_constructor.py
@@ -35,7 +35,7 @@ def attribute_check(e, varname: str):
     e4 = Expression(
         SymbolPlus,
         *integer_ones,
-        elements_properties=ElementsProperties(True, True, True)
+        elements_properties=ElementsProperties(True, True, True),
     )
     attribute_check(e4, "e4")
     assert e1 == e4
diff --git a/test/core/test_sympy_python_convert.py b/test/core/test_sympy_python_convert.py
@@ -139,7 +139,7 @@ def testConvertedFunctions(self):
         self.compare(
             Expression(SymbolD, marg2, Symbol("Global`x")),
             sympy.Derivative(sarg2, sympy.Symbol("_Mathics_User_Global`x")),
-            **kwargs
+            **kwargs,
         )
 
     def testExpression(self):

Original file line number	Diff line number	Diff line change
`@@ -454,7 +454,7 @@ def result():`
`454`	`454`	`yield to_expression(`
`455`	`455`	`Symbol(out_palette_head),`
`456`	`456`	`*prototype,`
`457`		`- elements_conversion_fn=MachineReal`
	`457`	`+ elements_conversion_fn=MachineReal,`
`458`	`458`	`)`
`459`	`459`
`460`	`460`	`return to_mathics_list(*itertools.islice(result(), 0, at_most))`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ def xml_object(tree):`
`80`	`80`	`return Expression(`
`81`	`81`	`Expression(SymbolXMLObject, String("Document")),`
`82`	`82`	`to_mathics_list(*declaration),`
`83`		`- *node_to_xml_element(tree.getroot())`
	`83`	`+ *node_to_xml_element(tree.getroot()),`
`84`	`84`	`)`
`85`	`85`
`86`	`86`
Original file line number	Diff line number	Diff line change
`@@ -143,7 +143,7 @@ def xml_object(root):`
`143`	`143`	`return Expression(`
`144`	`144`	`to_expression("XMLObject", String("Document")),`
`145`	`145`	`to_mathics_list(*declaration),`
`146`		`- *node_to_xml_element(root)`
	`146`	`+ *node_to_xml_element(root),`
`147`	`147`	`)`
`148`	`148`
`149`	`149`
Original file line number	Diff line number	Diff line change
`@@ -359,7 +359,7 @@ def evaluate_predicate(pred, evaluation):`
`359`	`359`	`if pred.has_form(("List", "Sequence"), None):`
`360`	`360`	`return Expression(`
`361`	`361`	`pred._head,`
`362`		`- *[evaluate_predicate(subp, evaluation) for subp in pred.elements]`
	`362`	`+ *[evaluate_predicate(subp, evaluation) for subp in pred.elements],`
`363`	`363`	`)`
`364`	`364`
`365`	`365`	`debug_logical_expr("reducing ", pred, evaluation)`
Original file line number	Diff line number	Diff line change
`@@ -845,7 +845,7 @@ def eval_list(self, polys, varlist, evaluation: Evaluation, options: dict):`
`845`	`845`	`SymbolTable,`
`846`	`846`	`Integer(0),`
`847`	`847`	`ListExpression(Integer(dim1)),`
`848`		`- *its2`
	`848`	`+ *its2,`
`849`	`849`	`)`
`850`	`850`	`else:`
`851`	`851`	`newtable = Expression(SymbolTable, Integer(0), *its2)`
`@@ -952,7 +952,7 @@ def eval(self, expr, form, evaluation):`
`952`	`952`	`self.__class__.__name__, expr, form, Integer(n), evaluation`
`953`	`953`	`)`
`954`	`954`	`for n in range(dimensions[0] + 1)`
`955`		`- ]`
	`955`	`+ ],`
`956`	`956`	`)`
`957`	`957`	`elif form.has_form("List", 1):`
`958`	`958`	`form = form.elements[0]`
`@@ -963,7 +963,7 @@ def eval(self, expr, form, evaluation):`
`963`	`963`	`self.__class__.__name__, expr, form, Integer(n), evaluation`
`964`	`964`	`)`
`965`	`965`	`for n in range(dimensions[0] + 1)`
`966`		`- ]`
	`966`	`+ ],`
`967`	`967`	`)`
`968`	`968`	`else:`
`969`	`969`
Original file line number	Diff line number	Diff line change
`@@ -160,7 +160,7 @@ def eval(self, eqn, y, x, evaluation: Evaluation):`
`160`	`160`	`Expression(`
`161`	`161`	`SymbolFunction,`
`162`	`162`	`function_form,`
`163`		`- *from_sympy(soln).elements[1:]`
	`163`	`+ *from_sympy(soln).elements[1:],`
`164`	`164`	`),`
`165`	`165`	`),`
`166`	`166`	`)`