diff --git a/mathics/builtin/__init__.py b/mathics/builtin/__init__.py index 25c9e4ee7..abf253fe5 100755 --- a/mathics/builtin/__init__.py +++ b/mathics/builtin/__init__.py @@ -23,7 +23,11 @@ import re from mathics.builtin.base import Builtin -from mathics.eval.builtin import add_builtins, import_builtins, name_is_builtin_symbol +from mathics.core.load_builtin import ( + add_builtins, + import_builtins, + name_is_builtin_symbol, +) from mathics.settings import ENABLE_FILES_MODULE # Get a list of files in this directory. We'll exclude from the start diff --git a/mathics/core/definitions.py b/mathics/core/definitions.py index 64de0cb91..93643fcc0 100644 --- a/mathics/core/definitions.py +++ b/mathics/core/definitions.py @@ -15,9 +15,9 @@ from mathics.core.convert.expression import to_mathics_list from mathics.core.element import fully_qualified_symbol_name from mathics.core.expression import Expression +from mathics.core.load_builtin import definition_contribute from mathics.core.symbols import Atom, Symbol, strip_context from mathics.core.systemsymbols import SymbolGet -from mathics.eval.builtin import definition_contribute type_compiled_pattern = type(re.compile("a.a")) diff --git a/mathics/eval/builtin.py b/mathics/core/load_builtin.py similarity index 100% rename from mathics/eval/builtin.py rename to mathics/core/load_builtin.py diff --git a/mathics/docpipeline.py b/mathics/docpipeline.py index c5132fa77..d2b8aee3b 100644 --- a/mathics/docpipeline.py +++ b/mathics/docpipeline.py @@ -25,9 +25,9 @@ from mathics.builtin import builtins_by_module from mathics.core.definitions import Definitions from mathics.core.evaluation import Evaluation, Output +from mathics.core.load_builtin import builtins_dict from mathics.core.parser import MathicsSingleLineFeeder from mathics.doc.common_doc import MathicsMainDocumentation -from mathics.eval.builtin import builtins_dict from mathics.eval.pymathics import PyMathicsLoadException, eval_LoadModule from mathics.timing import show_lru_cache_statistics diff --git a/mathics/eval/pymathics.py b/mathics/eval/pymathics.py index 448d761a6..e4b68ccc4 100644 --- a/mathics/eval/pymathics.py +++ b/mathics/eval/pymathics.py @@ -9,7 +9,7 @@ from mathics.builtin import builtins_by_module from mathics.builtin.base import Builtin from mathics.core.definitions import Definitions -from mathics.eval.builtin import name_is_builtin_symbol +from mathics.core.load_builtin import name_is_builtin_symbol # The below set and dictionary are used in document generation # for Pymathics modules.