Merge pull request #776 from Mathics3/eval-pymathics

mathics.core.pymathics -> mathics.eval.pymathics
Mathics3 · Feb 5, 2023 · 629275c · 629275c
2 parents a9741b3 + 6b8ab56
commit 629275c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git 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
@@ -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 → mathics/eval/pymathics.py b/mathics/core/pymathics.py → 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):