merge master

Author: mmatera

mathics/builtin/__init__.py

@@ -85,7 +85,6 @@ def is_builtin(var):
 mathics_to_python = {}  # here we have: name -> string
 sympy_to_mathics = {}
 
-# box_constructs = {}
 pattern_objects = {}
 builtins_precedence = {}
 
@@ -101,9 +100,6 @@ def add_builtins(new_builtins):
             mathics_to_sympy[name] = builtin
             for sympy_name in builtin.get_sympy_names():
                 sympy_to_mathics[sympy_name] = builtin
-        # if isinstance(builtin, BoxConstruct):
-        #    box_constructs[name] = builtin
-        #    print("BC ", name)
         if isinstance(builtin, Operator):
             builtins_precedence[name] = builtin.precedence
         if isinstance(builtin, PatternObject):

mathics/builtin/base.py

@@ -60,7 +60,6 @@ def has_option(options, name, evaluation):
 
 class Builtin(object):
     name: typing.Optional[str] = None
-    # context = "System`"
     context = ""
     abstract = False
     attributes: typing.Tuple[Any, ...] = ()
@@ -621,13 +620,13 @@ def same(self, expr):
 
     def is_atom(self):
         return False
-    
+
     def do_format(self, evaluation, format):
         return self
-    
+
     def format(self, evaluation, fmt):
         return self
-        
+
     def get_head(self):
         return Symbol(self.get_name())
 
@@ -646,7 +645,7 @@ def leaves(self):
     @leaves.setter
     def leaves(self, value):
         raise ValueError('BoxConstruct.leaves is write protected.')
-    
+
     # I need to repeat this, because this is not
     # an expression...
     def has_form(self, heads, *leaf_counts):
@@ -680,9 +679,6 @@ def has_form(self, heads, *leaf_counts):
     def flatten_pattern_sequence(self, evaluation)  -> 'BoxConstruct':
         return self
 
-#    def get_name(self):
-        
-    
     def get_option_values(self, leaves, **options):
         evaluation = options.get("evaluation", None)
         if evaluation:

mathics/builtin/compilation.py

@@ -168,7 +168,7 @@ def boxes_to_xml(self, leaves=None, **options):
 
     def boxes_to_tex(self, leaves=None, **options):
         if not leaves:
-            leaves = self._leaves        
+            leaves = self._leaves
         return '-CompiledCode-'
 
 

mathics/builtin/graphics.py

@@ -2941,7 +2941,7 @@ class GraphicsBox(BoxConstruct):
     def boxes_to_text(self, leaves=None, **options):
         if not leaves:
             leaves = self._leaves
-            
+
         self._prepare_elements(leaves, options)  # to test for Box errors
         return "-Graphics-"
 

mathics/core/definitions.py

@@ -162,7 +162,7 @@ def load_pymathics_module(self, module, remove_on_quit=True):
             if remove_on_quit and name not in self.pymathics:
                 self.pymathics[name] = self.builtin.get(name, None)
         self.builtin.update(newsymbols)
-        
+
         for name, item in newsymbols.items():
             if name != "System`MakeBoxes":
                 item.contribute(self, is_pymodule=True)

mathics/core/expression.py

@@ -434,7 +434,7 @@ def format_expr(expr):
                     if result is not None and result != expr:
                         return result.evaluate(evaluation)
                 return None
-            
+
             formatted = format_expr(expr)
             if formatted is not None:
                 result = formatted.do_format(evaluation, form)
@@ -664,7 +664,7 @@ class Expression(BaseExpression):
     _sequences: Any
 
     def __new__(cls, head, *leaves, **kwargs) -> 'Expression':
-        self = super(Expression, cls).__new__(cls)    
+        self = super(Expression, cls).__new__(cls)
         if isinstance(head, str):
             head = Symbol(head)
         self._head = head