Segregate I/O, Files, and Filesystem builtins

Author: rocky

mathics/builtin/__init__.py

@@ -116,22 +116,25 @@ def is_builtin(var):
 
 
 # FIXME: redo using importlib since that is probably less fragile.
-exclude_files = set(("files", "codetables", "base", "importexport", "colors"))
+exclude_files = set(("codetables", "base"))
 module_names = [
     f for f in __py_files__ if re.match("^[a-z0-9]+$", f) if f not in exclude_files
 ]
 
-if ENABLE_FILES_MODULE:
-    module_names += ["files", "importexport"]
-
 modules = []
 import_builtins(module_names)
 
 _builtins = []
 builtins_by_module = {}
 
-for subdir in ("drawing", "numbers", "specialfns",):
+disable_file_module_names = ["files_io.files", "files_io.importexport"] if ENABLE_FILES_MODULE else []
+
+for subdir in ("drawing", "files_io", "numbers", "specialfns",):
     import_name = f"{__name__}.{subdir}"
+
+    if import_name in disable_file_module_names:
+        continue
+
     builtin_module = importlib.import_module(import_name)
     submodule_names = [
         modname

mathics/builtin/files_io/__init__.py

@@ -0,0 +1,3 @@
+"""
+Input/Output, Files, and Filesystem
+"""

mathics/builtin/files.py mathics/builtin/files_io/files.pymathics/builtin/files.py renamed to mathics/builtin/files_io/files.py

@@ -37,7 +37,7 @@
 )
 
 from mathics.builtin.base import Builtin, Predefined
-from mathics.builtin.files import (
+from mathics.builtin.files_io.files import (
     DIRECTORY_STACK,
     INITIAL_DIR,  # noqa is used via global
     mathics_open

mathics/builtin/filesystem.py mathics/builtin/files_io/filesystem.pymathics/builtin/filesystem.py renamed to mathics/builtin/files_io/filesystem.py

@@ -27,7 +27,7 @@
     get_option,
 )
 
-from .pymimesniffer import magic
+from mathics.builtin.pymimesniffer import magic
 import mimetypes
 import sys
 from itertools import chain

mathics/builtin/importexport.py mathics/builtin/files_io/importexport.pymathics/builtin/importexport.py renamed to mathics/builtin/files_io/importexport.py

@@ -1,9 +1,10 @@
 # -*- coding: utf-8 -*-
 """
-The Main Loop
+Main Loop I/O Hooks
 """
 
 from mathics.version import __version__  # noqa used in loading to check consistency.
+
 from mathics.builtin.base import Builtin
 
 

mathics/builtin/iohooks.py mathics/builtin/files_io/iohooks.pymathics/builtin/iohooks.py renamed to mathics/builtin/files_io/iohooks.py

@@ -8,7 +8,7 @@
 from mathics.version import __version__  # noqa used in loading to check consistency.
 
 from mathics.builtin.base import Builtin
-from mathics.builtin.files import mathics_open
+from mathics.builtin.files_io.files import mathics_open
 from mathics.core.expression import (
     Expression,
     String,

mathics/builtin/xmlformat.py

@@ -124,6 +124,7 @@ def subdirs(root, file="*.*", depth=10):
         "mathics.builtin",
         "mathics.builtin.compile",
         "mathics.builtin.drawing",
+        "mathics.builtin.files_io",
         "mathics.builtin.numbers",
         "mathics.builtin.numpy_utils",
         "mathics.builtin.pymimesniffer",