Merge pull request #900 from Mathics3/move-builtin.base-to-mathics.core.builtin

mathics.builtin.base -> mathics.core.builtin

Author: rocky

admin-tools/build_and_check_manifest.py

@@ -2,7 +2,7 @@
 
 import sys
 
-from mathics.builtin.base import Builtin
+from mathics.core.builtin import Builtin
 from mathics.core.load_builtin import (
     import_and_load_builtins,
     modules,

mathics/builtin/arithfns/basic.py

@@ -8,13 +8,6 @@
 """
 
 from mathics.builtin.arithmetic import create_infix
-from mathics.builtin.base import (
-    BinaryOperator,
-    Builtin,
-    MPMathFunction,
-    PrefixOperator,
-    SympyFunction,
-)
 from mathics.core.atoms import (
     Complex,
     Integer,
@@ -37,6 +30,13 @@
     A_PROTECTED,
     A_READ_PROTECTED,
 )
+from mathics.core.builtin import (
+    BinaryOperator,
+    Builtin,
+    MPMathFunction,
+    PrefixOperator,
+    SympyFunction,
+)
 from mathics.core.convert.expression import to_expression
 from mathics.core.convert.sympy import from_sympy
 from mathics.core.expression import Expression

mathics/builtin/arithfns/sums.py

@@ -6,7 +6,7 @@
 """
 
 
-from mathics.builtin.base import Builtin
+from mathics.core.builtin import Builtin
 
 
 class Accumulate(Builtin):

mathics/builtin/arithmetic.py

@@ -10,15 +10,6 @@
 
 import sympy
 
-from mathics.builtin.base import (
-    Builtin,
-    IterationFunction,
-    MPMathFunction,
-    Predefined,
-    SympyFunction,
-    SympyObject,
-    Test,
-)
 from mathics.builtin.inference import get_assumptions_list
 from mathics.builtin.numeric import Abs
 from mathics.builtin.scoping import dynamic_scoping
@@ -41,6 +32,15 @@
     A_NUMERIC_FUNCTION,
     A_PROTECTED,
 )
+from mathics.core.builtin import (
+    Builtin,
+    IterationFunction,
+    MPMathFunction,
+    Predefined,
+    SympyFunction,
+    SympyObject,
+    Test,
+)
 from mathics.core.convert.sympy import SympyExpression, from_sympy, sympy_symbol_prefix
 from mathics.core.element import BaseElement
 from mathics.core.evaluation import Evaluation

mathics/builtin/assignments/assign_binaryop.py

@@ -16,8 +16,8 @@
 """
 
 
-from mathics.builtin.base import BinaryOperator, PostfixOperator, PrefixOperator
 from mathics.core.attributes import A_HOLD_FIRST, A_PROTECTED, A_READ_PROTECTED
+from mathics.core.builtin import BinaryOperator, PostfixOperator, PrefixOperator
 
 
 class AddTo(BinaryOperator):

mathics/builtin/assignments/assignment.py

@@ -4,7 +4,6 @@
 """
 
 
-from mathics.builtin.base import BinaryOperator, Builtin
 from mathics.core.assignment import (
     ASSIGNMENT_FUNCTION_MAP,
     AssignmentException,
@@ -18,6 +17,7 @@
     A_PROTECTED,
     A_SEQUENCE_HOLD,
 )
+from mathics.core.builtin import BinaryOperator, Builtin
 from mathics.core.symbols import SymbolNull
 from mathics.core.systemsymbols import SymbolFailed
 from mathics.eval.pymathics import PyMathicsLoadException, eval_LoadModule

mathics/builtin/assignments/clear.py

@@ -4,7 +4,6 @@
 """
 
 
-from mathics.builtin.base import Builtin, PostfixOperator
 from mathics.core.assignment import is_protected
 from mathics.core.atoms import String
 from mathics.core.attributes import (
@@ -16,6 +15,7 @@
     A_PROTECTED,
     A_READ_PROTECTED,
 )
+from mathics.core.builtin import Builtin, PostfixOperator
 from mathics.core.expression import Expression
 from mathics.core.symbols import Atom, Symbol, SymbolNull, symbol_set
 from mathics.core.systemsymbols import (

mathics/builtin/assignments/types.py

@@ -11,9 +11,9 @@
 """
 
 
-from mathics.builtin.base import Builtin
 from mathics.core.assignment import get_symbol_values
 from mathics.core.attributes import A_HOLD_ALL, A_PROTECTED
+from mathics.core.builtin import Builtin
 
 
 class DefaultValues(Builtin):

mathics/builtin/assignments/upvalues.py

@@ -9,9 +9,9 @@
 https://reference.wolfram.com/language/tutorial/TransformationRulesAndDefinitions.html#6972</url>.
 """
 
-from mathics.builtin.base import Builtin
 from mathics.core.assignment import get_symbol_values
 from mathics.core.attributes import A_HOLD_ALL, A_PROTECTED
+from mathics.core.builtin import Builtin
 
 
 # In Mathematica 5, this appears under "Types of Values".

mathics/builtin/atomic/atomic.py

@@ -3,8 +3,8 @@
 Atomic Primitives
 """
 
-from mathics.builtin.base import Builtin, Test
 from mathics.core.atoms import Atom
+from mathics.core.builtin import Builtin, Test
 
 
 class AtomQ(Test):