Merge pull request #1321 from mathics/builtin-submodules

Builtin submodules

Author: rocky

mathics/builtin/__init__.py

@@ -130,7 +130,7 @@ def is_builtin(var):
 _builtins = []
 builtins_by_module = {}
 
-for subdir in ("specialfns",):
+for subdir in ("drawing", "numbers", "specialfns",):
     import_name = f"{__name__}.{subdir}"
     builtin_module = importlib.import_module(import_name)
     submodule_names = [

mathics/builtin/assignment.py

@@ -1922,11 +1922,11 @@ class LoadModule(Builtin):
     def apply(self, module, evaluation):
         "LoadModule[module_String]"
         try:
-            module_loaded = evaluation.definitions.load_pymathics_module(module.value)
-        except PyMathicsLoadException as e:
+            evaluation.definitions.load_pymathics_module(module.value)
+        except PyMathicsLoadException:
             evaluation.message(self.name, "notmathicslib", module)
             return SymbolFailed
-        except ImportError as e:
+        except ImportError:
             evaluation.message(self.get_name(), "notfound", module)
             return SymbolFailed
         else:

mathics/builtin/comparison.py

@@ -13,7 +13,7 @@
     SympyFunction,
 )
 
-from mathics.builtin.constants import mp_convert_constant
+from mathics.builtin.numbers.constants import mp_convert_constant
 
 from mathics.core.expression import (
     COMPARE_PREC,

mathics/builtin/drawing/__init__.py

@@ -0,0 +1,3 @@
+"""
+Graphics, Drawing, and Images
+"""

mathics/builtin/colors.py mathics/builtin/drawing/colors.pymathics/builtin/colors.py renamed to mathics/builtin/drawing/colors.py

@@ -14,7 +14,7 @@
     SymbolList,
 )
 from mathics.builtin.base import BoxConstructError, Builtin, InstanceableBuiltin
-from .graphics import (
+from mathics.builtin.graphics import (
     Graphics,
     GraphicsBox,
     PolygonBox,

mathics/builtin/graphics3d.py mathics/builtin/drawing/graphics3d.pymathics/builtin/graphics3d.py renamed to mathics/builtin/drawing/graphics3d.py

@@ -21,7 +21,7 @@
     SymbolRule,
     from_python,
 )
-from mathics.builtin.colors import (
+from mathics.builtin.drawing.colors import (
     convert as convert_color,
     colorspaces as known_colorspaces,
 )
@@ -1599,7 +1599,7 @@ def apply(self, values, evaluation, options):
         ):
             color_function = String("LakeColors")
 
-        from mathics.builtin.plot import gradient_palette
+        from mathics.builtin.drawing.plot import gradient_palette
 
         cmap = gradient_palette(color_function, n, evaluation)
         if not cmap:

mathics/builtin/image.py mathics/builtin/drawing/image.pymathics/builtin/image.py renamed to mathics/builtin/drawing/image.py

@@ -24,12 +24,13 @@
     SymbolN,
     SymbolRule,
 )
+
 from mathics.builtin.base import Builtin
-from mathics.builtin.scoping import dynamic_scoping
-from mathics.builtin.options import options_to_rules
-from mathics.builtin.numeric import chop
 from mathics.builtin.graphics import Graphics
-from mathics.builtin.graphics3d import Graphics3D
+from mathics.builtin.drawing.graphics3d import Graphics3D
+from mathics.builtin.numeric import chop
+from mathics.builtin.options import options_to_rules
+from mathics.builtin.scoping import dynamic_scoping
 
 
 try:
@@ -39,7 +40,6 @@
 except ImportError:
     has_compile = False
 
-
 def gradient_palette(color_function, n, evaluation):  # always returns RGB values
     if isinstance(color_function, String):
         color_data = Expression("ColorData", color_function).evaluate(evaluation)
@@ -340,7 +340,6 @@ def get_plot_range(values, all_values, option):
 
 
 class _Plot(Builtin):
-    from .graphics import Graphics
 
     attributes = ("HoldAll",)
 
@@ -705,8 +704,6 @@ def find_excl(excl):
 class _Chart(Builtin):
     attributes = ("HoldAll",)
 
-    from .graphics import Graphics
-
     options = Graphics.options.copy()
     options.update(
         {
@@ -1135,8 +1132,6 @@ class Histogram(Builtin):
      = -Graphics-
     """
 
-    from .graphics import Graphics
-
     attributes = ("HoldAll",)
 
     options = Graphics.options.copy()
@@ -2224,8 +2219,6 @@ class ListPlot(_ListPlot):
      = -Graphics-
     """
 
-    from .graphics import Graphics
-
     attributes = ("HoldAll",)
 
     options = Graphics.options.copy()
@@ -2264,8 +2257,6 @@ class ListLinePlot(_ListPlot):
      = -Graphics-
     """
 
-    from .graphics import Graphics
-
     attributes = ("HoldAll",)
 
     options = Graphics.options.copy()
@@ -2344,8 +2335,6 @@ class Plot3D(_Plot3D):
     #> Plot3D[x + 2y, {x, -2, 2}, {y, -2, 2}] // TeXForm
     """
 
-    from .graphics import Graphics
-
     attributes = ("HoldAll",)
 
     options = Graphics.options.copy()
@@ -2428,8 +2417,6 @@ class DensityPlot(_Plot3D):
      = -Graphics-
     """
 
-    from .graphics import Graphics
-
     attributes = ("HoldAll",)
 
     options = Graphics.options.copy()

mathics/builtin/plot.py mathics/builtin/drawing/plot.pymathics/builtin/plot.py renamed to mathics/builtin/drawing/plot.py

@@ -35,7 +35,6 @@
     String,
     Symbol,
     SymbolFailed,
-    SymbolFalse,
     SymbolNull,
     SymbolTrue,
     from_mpmath,
@@ -46,10 +45,8 @@
     Stream,
     path_search,
     stream_manager,
-    urlsave_tmp,
 )
 from mathics.builtin.base import Builtin, Predefined, BinaryOperator, PrefixOperator
-from mathics.builtin.numeric import Hash
 from mathics.builtin.strings import to_python_encoding
 from mathics.builtin.base import MessageException