Add drawing and numbers builtin submodules

Move corresponding files in builtins under these submodules.
Adjust lots of imports to include the new submodule

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/combinatorial.py

@@ -9,7 +9,7 @@
 
 from mathics.builtin.base import Builtin
 from mathics.core.expression import Expression, Integer, Symbol, SymbolTrue, SymbolFalse
-from mathics.builtin.arithmetic import _MPMathFunction
+from mathics.builtin.numbers.arithmetic import _MPMathFunction
 from itertools import combinations
 
 

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

@@ -34,7 +34,7 @@
     system_symbols_dict,
     from_python,
 )
-from mathics.builtin.colors import convert as convert_color
+from mathics.builtin.drawing.colors import convert as convert_color
 from mathics.core.numbers import machine_epsilon
 
 GRAPHICS_OPTIONS = {
@@ -60,7 +60,7 @@ class ColorError(BoxConstructError):
 
 
 def get_class(name):
-    from mathics.builtin.graphics3d import GLOBALS3D
+    from mathics.builtin.drawing.graphics3d import GLOBALS3D
 
     c = GLOBALS.get(name)
     if c is None:
@@ -524,7 +524,7 @@ def convert(content):
                 options[option] = Expression(SymbolN, options[option]).evaluate(
                     evaluation
                 )
-        from mathics.builtin.graphics3d import Graphics3DBox, Graphics3D
+        from mathics.builtin.drawing.graphics3d import Graphics3DBox, Graphics3D
 
         if type(self) is Graphics:
             return GraphicsBox(

mathics/builtin/graphics.py mathics/builtin/drawing/graphics.pymathics/builtin/graphics.py renamed to mathics/builtin/drawing/graphics.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,
 )
@@ -1294,7 +1294,7 @@ def apply(self, input, colorspace, evaluation):
         if isinstance(input, Image):
             return input.color_convert(colorspace.get_string_value())
         else:
-            from mathics.builtin.graphics import (
+            from mathics.builtin.drawing.graphics import (
                 expression_to_color,
                 color_to_expression,
             )
@@ -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/graphics3d.py mathics/builtin/drawing/graphics3d.pymathics/builtin/graphics3d.py renamed to mathics/builtin/drawing/graphics3d.py

@@ -24,12 +24,13 @@
     SymbolN,
     SymbolRule,
 )
+
 from mathics.builtin.base import Builtin
-from mathics.builtin.scoping import dynamic_scoping
+from mathics.builtin.drawing.graphics import Graphics
+from mathics.builtin.drawing.graphics3d import Graphics3D
+from mathics.builtin.numbers.numeric import chop
 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.scoping import dynamic_scoping
 
 
 try:
@@ -64,7 +65,7 @@ def gradient_palette(color_function, n, evaluation):  # always returns RGB value
     if len(colors.leaves) != n:
         return
 
-    from mathics.builtin.graphics import expression_to_color, ColorError
+    from mathics.builtin.drawing.graphics import expression_to_color, ColorError
 
     try:
         objects = [expression_to_color(x) for x in colors.leaves]