Revert doc.py changes to minimum...

Don't try to handle sectioning right now.

Author: rocky

mathics/doc/doc.py

@@ -1,13 +1,12 @@
 # -*- coding: utf-8 -*-
 
-from html import escape as html_escape
 import re
 from os import getenv, listdir
 import pickle
 import importlib
-import pkgutil
 
 from mathics import settings
+from html import escape as html_escape
 
 from mathics import builtin
 from mathics.builtin import get_module_doc
@@ -111,15 +110,6 @@
 except IOError:
     xml_data = {}
 
-def get_submodule_names(object):
-    modpkgs = []
-    if hasattr(object, '__path__'):
-        for importer, modname, ispkg in pkgutil.iter_modules(object.__path__):
-            modpkgs.append(modname)
-        modpkgs.sort()
-    return modpkgs
-
-
 
 def filter_comments(doc):
     return "\n".join(
@@ -252,23 +242,15 @@ def repl_list(match):
         [
             ("$", r"\$"),
             ("\u03c0", r"$\pi$"),
-            (" ", r"$\ge$"),
-            (" ", r"$\le$"),
-            (" ", r"$\ne$"),
-
+            ("≥", r"$\ge$"),
+            ("≤", r"$\le$"),
+            ("≠", r"$\ne$"),
             ("ç", r"\c{c}"),
             ("é", r"\'e"),
             ("ê", r"\^e"),
             ("ñ", r"\~n"),
             ("∫", r"\int"),
             ("", r"d"),
-            # Redo above as something like:
-            # ("\u00e7", r"\c{c}"),
-            # ("\u00e9", r"\'e"),
-            # ("\u00ea", r"\^e"),
-            # ("\00f1", r"\~n"),
-            # ("\u222b", r"\int"),
-            # ("\uf74c", r"d"),
         ],
     )
 
@@ -495,7 +477,6 @@ def post_sub(text, post_substitutions):
     return text
 
 
-# FIXME: can we replace this with Python 3's html.escape ?
 def escape_html(text, verbatim_mode=False, counters=None, single_line=False):
     def repl_python(match):
         return (
@@ -636,7 +617,6 @@ def repl_subsection(match):
         text = text.replace("\\" + key, xml)
 
     if not single_line:
-        # FIXME: linebreaks() is not defined
         # text = linebreaks(text)
         text = text.replace("<br />", "\n").replace("<br>", "<br />")
 
@@ -677,7 +657,7 @@ def get_prev_next(self):
         return prev, next
 
     def get_title_html(self):
-        return escape_html(self.title, single_line=True)
+        return html_escape(self.title, single_line=True)
 
 
 class Documentation(DocElement):
@@ -811,36 +791,21 @@ def __init__(self):
                 title, text = get_module_doc(module)
                 chapter = DocChapter(builtin_part, title, Doc(text))
                 builtins = builtins_by_module[module.__name__]
-
-                if module.__file__.endswith("__init__.py"):
-                    section_names = get_submodule_names(module)
-                else:
-                    section_names = builtins
-
-                for instance in section_names:
+                for instance in builtins:
                     installed = True
                     for package in getattr(instance, "requires", []):
                         try:
                             importlib.import_module(package)
                         except ImportError:
                             installed = False
                             break
-                    if isinstance(instance, str):
-                        section = DocSection(
-                            chapter,
-                            instance,
-                            "",
-                            None,
-                            installed=installed,
-                        )
-                    else:
-                        section = DocSection(
-                            chapter,
-                            strip_system_prefix(instance.get_name()),
-                            instance.__doc__ or "",
-                            operator=instance.get_operator(),
-                            installed=installed,
-                        )
+                    section = DocSection(
+                        chapter,
+                        strip_system_prefix(instance.get_name()),
+                        instance.__doc__ or "",
+                        operator=instance.get_operator(),
+                        installed=installed,
+                    )
                     chapter.sections.append(section)
                 builtin_part.chapters.append(chapter)
             self.parts.append(builtin_part)
@@ -1205,7 +1170,7 @@ def latex(self, output):
 
     def html(self):
         counters = {}
-        return html_escape(
+        return escape_html(
             "\n".join(
                 item.html(counters) for item in self.items if not item.is_private()
             )