diff --git a/pymathics/hello/__main__.py b/pymathics/hello/__main__.py index 589e73b..a20ea21 100644 --- a/pymathics/hello/__main__.py +++ b/pymathics/hello/__main__.py @@ -1,6 +1,5 @@ # -*- coding: utf-8 -*- -from mathics.core.atoms import String -from mathics.core.builtin import Builtin +from mathics.builtin.base import Builtin, String class Hello(Builtin): @@ -14,7 +13,7 @@ class Hello(Builtin): """ # The function below should start with "apply" - def eval_with_name(self, person, evaluation): + def apply_with_name(self, person, evaluation): "%(name)s[person_String]" # %(name)s is just a more flexible way of writing "Hello". # If the class name changes, so will the above pattern. diff --git a/test/test_hello.py b/test/test_hello.py index eab9964..102a9f7 100644 --- a/test/test_hello.py +++ b/test/test_hello.py @@ -1,11 +1,6 @@ - - -from mathics.core.load_builtin import import_and_load_builtins from mathics.session import MathicsSession -import_and_load_builtins() - -session = MathicsSession(character_encoding="ASCII") +session = MathicsSession(add_builtin=True, catch_interrupt=False) def check_evaluation(str_expr: str, expected: str, message=""):