clean up

Author: mmatera

mathics/builtin/__init__.py

@@ -23,6 +23,7 @@
     PatternObject,
 )
 
+from mathics.settings import ENABLE_FILES_MODULE
 
 exclude_files = set(("files", "codetables", "base", "importexport", "colors"))
 module_names = [

mathics/builtin/functional.py

@@ -89,38 +89,9 @@ def apply_named(self, vars, body, args, evaluation):
                 var.get_name() for var in vars), args[:len(vars)])))
             return body.replace_vars(vars)
 
-    def apply_named_attr(self, vars, body, attr, args, evaluation):
-        'Function[vars_, body_, attr_][args___]'
-
-        ## FIXME: In order to get the proper behaviour, we need
-        ## to take into account  the attributes in the evaluation
-        ##
-
-        print("Warning: incomplete implementation")
-        if attr.has_form('List', None):
-            attr = [str(a) for a in  attr.leaves]
-        else:
-            attr = [str(attr)]
-
-            
-        if vars.has_form('List', None):
-            vars = vars.leaves
-        else:
-            vars = [vars]
-
-
-        args = args.get_sequence()        
-        if len(vars) > len(args):
-            evaluation.message('Function', 'fpct', )
-        else:
-            vars = dict(list(zip((
-                var.get_name() for var in vars), args[:len(vars)])))
-            return body.replace_vars(vars)
-
-
     # Not sure if DRY is possible here...
     def apply_named_attr(self, vars, body, attr, args, evaluation):
-        'Function[vars_, body_, attr_][args___]'        
+        'Function[vars_, body_, attr_][args___]'
         if vars.has_form('List', None):
             vars = vars.leaves
         else:

mathics/builtin/lists.py

@@ -443,6 +443,7 @@ def select(inner):
 
     return select
 
+
 def _parts_span_selector(pspec):
     if len(pspec.leaves) > 3:
         raise MessageException("Part", "span", pspec)

mathics/builtin/options.py

@@ -129,6 +129,7 @@ class OptionValue(Builtin):
         'optnf': "Option name `1` not found.",
     }
 
+
     rules = {
         'OptionValue[optnames_List]': 'OptionValue/@optnames',
         'OptionValue[f_, optnames_List]': 'OptionValue[f,#1]&/@optnames',
@@ -298,8 +299,6 @@ def test(self, expr):
             expr = [expr]
         else:
             expr = expr.get_leaves()
-
-        
         return all(e.has_form('Rule', None) or e.has_form('RuleDelayed', 2)
                    for e in expr)
 

mathics/builtin/patterns.py

@@ -759,7 +759,6 @@ class Pattern_(PatternObject):
         'pattern_?(!MatchQ[#, _Blank|_BlankSequence|_BlankNullSequence]&)]': (
             'Infix[{symbol, pattern}, ":", 150, Left]'),
     }
-    precedence = 1000
 
     def init(self, expr):
         super(Pattern_, self).init(expr)

mathics/builtin/strings.py

@@ -1575,6 +1575,7 @@ class ToString(Builtin):
     >> "U" <> ToString[2]
      = U2
     """
+
     options = {'CharacterEncoding' : '"Unicode"',
                 'FormatType' : 'OutputForm',
                 'NumberMarks': '$NumberMarks',

test/test_cellstotex.py

@@ -47,7 +47,6 @@ def test_load():
     expected2 = _evaluate('{"CellToTeX", "CellsToTeXException", "CellsToTeXPreamble"}')
     print(result2)
     assert result2 == expected2
-    
 
 
 @pytest.mark.skipif(not url_reachable, reason="skipping since we can't reach %s" % external_url)
@@ -65,15 +64,12 @@ def test_load_and_run():
     if result0 == Symbol("System`$Failed"):
         return 0
 
-
-
     str_expr1 = 'CellsToTeXPreamble[]'
     str_expected1 = '"\\mmaSet{morefv={gobble=2,},}\\n"'
     result1 = _evaluate(str_expr1)
     expected1 = _evaluate(str_expected1)
     assert result1 == expected1
 
-    
     str_expr1 = 'boxes=MakeBoxes[Pi];\
                  cell = Cell[BoxData[boxes], "Input"];res=Catch[CellToTeX[cell, Style->"Input"]]'
     str_expected1 = '"\\begin{mmaCell}{Input}\n  \\pi\n\\end{mmaCell}"'

test/test_evaluation.py

@@ -55,7 +55,7 @@
 def test_evaluation(str_expr: str, str_expected: str, message=""):
     result = session.evaluate(str_expr)
     expected = session.evaluate(str_expected)
-    print("message=", message)
+
     if message:
         assert result == expected, message
     else: