diff --git a/mathics/builtin/assignments/assignment.py b/mathics/builtin/assignments/assignment.py index 384d96c59..9997e1267 100644 --- a/mathics/builtin/assignments/assignment.py +++ b/mathics/builtin/assignments/assignment.py @@ -17,9 +17,9 @@ A_PROTECTED, A_SEQUENCE_HOLD, ) -from mathics.core.pymathics import PyMathicsLoadException, eval_load_module from mathics.core.symbols import SymbolNull from mathics.core.systemsymbols import SymbolFailed +from mathics.eval.pymathics import PyMathicsLoadException, eval_LoadModule class _SetOperator: @@ -83,7 +83,7 @@ class LoadModule(Builtin): def eval(self, module, evaluation): "LoadModule[module_String]" try: - eval_load_module(module.value, evaluation) + eval_LoadModule(module.value, evaluation) except PyMathicsLoadException: evaluation.message(self.name, "notmathicslib", module) return SymbolFailed diff --git a/mathics/core/definitions.py b/mathics/core/definitions.py index 984a05294..71240f359 100644 --- a/mathics/core/definitions.py +++ b/mathics/core/definitions.py @@ -110,7 +110,7 @@ def __init__( # Rocky: this smells of something not quite right in terms of # modularity. import mathics.format # noqa - from mathics.core.pymathics import PyMathicsLoadException, load_pymathics_module + from mathics.eval.pymathics import PyMathicsLoadException, load_pymathics_module self.printforms = list(PrintForms) self.outputforms = list(OutputForms) diff --git a/mathics/core/pymathics.py b/mathics/eval/pymathics.py similarity index 97% rename from mathics/core/pymathics.py rename to mathics/eval/pymathics.py index 70f801fb0..b26813ce8 100644 --- a/mathics/core/pymathics.py +++ b/mathics/eval/pymathics.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ PyMathics3 module handling """ @@ -24,7 +23,7 @@ def __init__(self, module): self.module = module -def eval_load_module(module_name: str, evaluation: Evaluation) -> str: +def eval_LoadModule(module_name: str, evaluation: Evaluation) -> str: try: load_pymathics_module(evaluation.definitions, module_name) except (PyMathicsLoadException, ImportError):