rocky comments. Instancable->Instanceable

Author: mmatera

mathics/builtin/base.py

@@ -362,7 +362,7 @@ def get_option_string(self, *params):
         return None, s
 
 
-class InstancableBuiltin(Builtin):
+class InstanceableBuiltin(Builtin):
     def __new__(cls, *args, **kwargs):
         new_kwargs = kwargs.copy()
         new_kwargs["expression"] = False
@@ -375,7 +375,7 @@ def __new__(cls, *args, **kwargs):
             try:
                 instance.init(*args, **kwargs)
             except TypeError:
-                # TypeError occurs when unpickling instance, e.g. PatterObject,
+                # TypeError occurs when unpickling instance, e.g. PatternObject,
                 # because parameter expr is not given. This should no be a
                 # problem, as pickled objects need their init-method not
                 # being called.
@@ -590,14 +590,14 @@ class BoxConstructError(Exception):
     pass
 
 
-class BoxConstruct(InstancableBuiltin):
+class BoxConstruct(InstanceableBuiltin):
     def __new__(cls, *leaves, **kwargs):
         instance = super().__new__(cls, *leaves, **kwargs)
         instance._leaves = leaves
         return instance
 
     def evaluate(self, evaluation):
-        # Shall here evaluate the leaves?
+        # THINK about: Should we evaluate the leaves here?
         return
 
     def get_head_name(self):
@@ -707,7 +707,7 @@ def __init__(self, name, count, expected):
         super().__init__(None, None)
 
 
-class PatternObject(InstancableBuiltin, Pattern):
+class PatternObject(InstanceableBuiltin, Pattern):
     needs_verbatim = True
 
     arg_counts: typing.List[int] = []

mathics/builtin/graphics.py

@@ -14,7 +14,7 @@
 
 from mathics.builtin.base import (
     Builtin,
-    InstancableBuiltin,
+    InstanceableBuiltin,
     BoxConstruct,
     BoxConstructError,
 )
@@ -508,15 +508,14 @@ def convert(content):
         for option in options:
             if option not in ("System`ImageSize",):
                 options[option] = Expression("N", options[option]).evaluate(evaluation)
-        #box_name = "Graphics" + self.box_suffix
         from mathics.builtin.graphics3d import Graphics3DBox, Graphics3D
         if type(self) is Graphics:
             return GraphicsBox(convert(content), *options_to_rules(options))
         elif type(self) is Graphics3D:
             return Graphics3DBox(convert(content), *options_to_rules(options))
 
 
-class _GraphicsElement(InstancableBuiltin):
+class _GraphicsElement(InstanceableBuiltin):
     def init(self, graphics, item=None, style=None):
         if item is not None and not item.has_form(self.get_name(), None):
             raise BoxConstructError
@@ -3205,8 +3204,6 @@ def boxes_to_tex(self, leaves=None, **options):
     def boxes_to_xml(self, leaves=None, **options):
         if not leaves:
             leaves = self._leaves
-        evaluation = options.get("evaluation", None)
-
         elements, calc_dimensions = self._prepare_elements(leaves, options, neg_y=True)
 
         xmin, xmax, ymin, ymax, w, h, width, height = calc_dimensions()

mathics/builtin/graphics3d.py

@@ -8,7 +8,7 @@
 
 import numbers
 from mathics.core.expression import Expression, from_python, system_symbols_dict
-from mathics.builtin.base import BoxConstructError, Builtin, InstancableBuiltin
+from mathics.builtin.base import BoxConstructError, Builtin, InstanceableBuiltin
 from .graphics import (
     Graphics,
     GraphicsBox,
@@ -1130,7 +1130,7 @@ def apply_min(self, xmin, ymin, zmin, evaluation):
         return self.apply_full(xmin, ymin, zmin, xmax, ymax, zmax, evaluation)
 
 
-class _Graphics3DElement(InstancableBuiltin):
+class _Graphics3DElement(InstanceableBuiltin):
     def init(self, graphics, item=None, style=None):
         if item is not None and not item.has_form(self.get_name(), None):
             raise BoxConstructError

mathics/core/definitions.py

@@ -162,7 +162,7 @@ def load_pymathics_module(self, module, remove_on_quit=True):
         onload = loaded_module.pymathics_version_data.get("onload", None)
         if onload:
             onload(self)
-            
+
         return loaded_module
 
     def clear_pymathics_modules(self):