Merge github.com:mathics/Mathics into sanitizeloadmodules

Author: rocky

mathics/builtin/__init__.py

@@ -46,7 +46,7 @@
 
     modules.append(module)
 
-builtins = []
+_builtins = []
 builtins_by_module = {}
 
 
@@ -78,7 +78,7 @@ def is_builtin(var):
                 # This set the default context for symbols in mathics.builtins
                 if not type(instance).context:
                     type(instance).context = "System`"
-                builtins.append( (instance.get_name(), instance))
+                _builtins.append( (instance.get_name(), instance))
                 builtins_by_module[module.__name__].append(instance)
 
 
@@ -88,7 +88,6 @@ def is_builtin(var):
 mathics_to_python = {}  # here we have: name -> string
 sympy_to_mathics = {}
 
-box_constructs = {}
 pattern_objects = {}
 builtins_precedence = {}
 
@@ -104,20 +103,24 @@ def add_builtins(new_builtins):
             mathics_to_sympy[name] = builtin
             for sympy_name in builtin.get_sympy_names():
                 sympy_to_mathics[sympy_name] = builtin
-        if isinstance(builtin, BoxConstruct):
-            box_constructs[name] = builtin
         if isinstance(builtin, Operator):
             builtins_precedence[name] = builtin.precedence
         if isinstance(builtin, PatternObject):
             pattern_objects[name] = builtin.__class__
-    builtins.update(dict(new_builtins))
+    _builtins.update(dict(new_builtins))
 
 
-new_builtins = builtins
-builtins = {}
+new_builtins = _builtins
+_builtins = {}
 add_builtins(new_builtins)
 
 
+def builtins_dict():
+    return { builtin.get_name() : builtin
+             for modname, builtins in builtins_by_module.items()
+             for builtin in builtins}
+
+
 def get_module_doc(module):
     doc = module.__doc__
     if doc is not None:
@@ -137,8 +140,8 @@ def get_module_doc(module):
 
 def contribute(definitions):
     # let MakeBoxes contribute first
-    builtins["System`MakeBoxes"].contribute(definitions)
-    for name, item in builtins.items():
+    _builtins["System`MakeBoxes"].contribute(definitions)
+    for name, item in _builtins.items():
         if name != "System`MakeBoxes":
             item.contribute(definitions)