Merge pull request #1439 from TiagoCavalcanteTrindade/remove-notebook-from-settings

Remove System`$Notebooks from settings.m

Author: rocky

mathics/__init__.py

@@ -50,6 +50,18 @@
 if "cython" in version_info:
     version_string += f", cython {version_info['cython']}"
 
+
+def load_default_settings_files(definitions, load_cli_settings: bool = True):
+    import os.path as osp
+    from mathics.core.definitions import autoload_files
+
+    root_dir = osp.realpath(osp.dirname(__file__))
+
+    autoload_files(definitions, root_dir, "autoload", False)
+    if load_cli_settings:
+        autoload_files(definitions, root_dir, "autoload-cli", False)
+
+
 license_string = """\
 Copyright (C) 2011-2021 The Mathics Team.
 This program comes with ABSOLUTELY NO WARRANTY.

mathics/autoload/settings.m

@@ -10,10 +10,3 @@
 Settings`$PreferredBackendMethod::usage = "Set this do whether to use mpmath, numpy or Sympy for numeric and symbolic constants and methods when there is a choice";
 Settings`$PreferredBackendMethod = "sympy"
 Unprotect[Settings`$PreferredBackendMethod]
-
-(* FIXME: remove this when all front-ends are adjusted to set this. *)
-(* Some packages like Feyncalc, test for whether a they are being used
-inside a notbook. *)
-System`$Notebooks::usage = "Set True if the Mathics is being used with a notebook-based front end.";
-System`$Notebooks = False;
-Unprotect[System`$Notebooks];

mathics/core/definitions.py

@@ -41,25 +41,31 @@ def valuesname(name) -> str:
         return name[7:-6].lower()
 
 
-def autoload_files(defs, root_dir_path: str, autoload_dir):
+def autoload_files(
+    defs,
+    root_dir_path: str,
+    autoload_dir: str,
+    block_global_definitions: bool = True
+):
     from mathics.core.evaluation import Evaluation
 
     # Load symbols from the autoload folder
     for root, dirs, files in os.walk(os.path.join(root_dir_path, autoload_dir)):
         for path in [os.path.join(root, f) for f in files if f.endswith(".m")]:
             Expression("Get", String(path)).evaluate(Evaluation(defs))
 
-    # Move any user definitions created by autoloaded files to
-    # builtins, and clear out the user definitions list. This
-    # means that any autoloaded definitions become shared
-    # between users and no longer disappear after a Quit[].
-    #
-    # Autoloads that accidentally define a name in Global`
-    # could cause confusion, so check for this.
-    #
-    for name in defs.user:
-        if name.startswith("Global`"):
-            raise ValueError("autoload defined %s." % name)
+    if block_global_definitions:
+        # Move any user definitions created by autoloaded files to
+        # builtins, and clear out the user definitions list. This
+        # means that any autoloaded definitions become shared
+        # between users and no longer disappear after a Quit[].
+        #
+        # Autoloads that accidentally define a name in Global`
+        # could cause confusion, so check for this.
+
+        for name in defs.user:
+            if name.startswith("Global`"):
+                raise ValueError("autoload defined %s." % name)
 
 
 class PyMathicsLoadException(Exception):

test/test_settings.py

@@ -0,0 +1,31 @@
+# -*- coding: utf-8 -*-
+from .helper import session
+from mathics import load_default_settings_files
+
+
+def test_settings():
+    load_default_settings_files(session.definitions)
+
+    assert type(session.evaluate("Settings`$TraceGet").to_python()) is bool
+
+    assert (
+        session.evaluate("Settings`$TraceGet::usage").to_python()
+        != "Settings`$TraceGet::usage"
+    )
+
+    assert (
+        session.evaluate("Settings`$PreferredBackendMethod::usage").to_python()
+        != "Settings`$PreferredBackendMethod::usage"
+    )
+
+    assert type(session.evaluate("Settings`$PreferredBackendMethod").to_python()) is str
+
+    assert (
+        session.evaluate("System`$Notebooks::usage").to_python()
+        != "System`$Notebooks::usage"
+    )
+
+
+def test_is_not_notebook():
+    # the settings already were loaded
+    assert session.evaluate("System`$Notebooks").to_python() == False