Merge pull request #14 from Mathics3/revert-13-mathics-scanner-import

Revert "Mathics scanner import"

Author: rocky

mathicsscript/__main__.py

@@ -12,6 +12,7 @@
 
 from mathicsscript.format import format_output
 
+from mathics import replace_wl_with_unicode
 from mathics.core.parser import FileLineFeeder
 from mathics.core.definitions import Definitions
 from mathics.core.expression import Symbol, SymbolTrue, SymbolFalse
@@ -20,8 +21,6 @@
 from mathics import version_string, license_string
 from mathics import settings
 
-from mathics_scanner.characters import replace_wl_with_plain_text
-
 from pygments import highlight
 from pygments.lexers import MathematicaLexer
 
@@ -328,7 +327,7 @@ def main(
                 current_pos = GNU_readline.get_current_history_length()
                 for pos in range(last_pos, current_pos - 1):
                     GNU_readline.remove_history_item(pos)
-                wl_input = replace_wl_with_plain_text(source_code.rstrip(), use_unicode=unicode)
+                wl_input = replace_wl_with_unicode(source_code.rstrip())
                 GNU_readline.add_history(wl_input)
 
             if query is None:
@@ -345,7 +344,7 @@ def main(
                 query, timeout=settings.TIMEOUT, format="unformatted"
             )
             if result is not None:
-                shell.print_result(result, output_style, use_unicode=unicode)
+                shell.print_result(result, output_style)
 
         except ShellEscapeException as e:
             source_code = e.line

mathicsscript/format.py

@@ -12,7 +12,7 @@ def format_output(obj, expr, format=None):
         format = obj.format
 
     if isinstance(format, dict):
-        return {k: obj.format_output(expr, f) for k, f in format.items()}
+        return dict((k, obj.format_output(expr, f)) for k, f in format.items())
 
     from mathics.core.expression import Expression, BoxError
 

mathicsscript/termshell.py

@@ -9,14 +9,11 @@
 import sys
 import re
 from columnize import columnize
+from mathics import replace_unicode_with_wl
 from mathics.core.expression import Expression, String, Symbol
 from mathics.core.expression import strip_context, from_python
 from mathics.core.rules import Rule
-from mathics_scanner.characters import (
-    named_characters,
-    replace_unicode_with_wl,
-    replace_wl_with_plain_text,
-)
+from mathics.core.characters import named_characters
 
 from pygments import highlight, lex
 from mathicsscript.mmalexer import MathematicaLexer
@@ -256,7 +253,7 @@ def read_line(self, prompt):
             raise ShellEscapeException(line)
         return replace_unicode_with_wl(line)
 
-    def print_result(self, result, output_style="", use_unicode=True):
+    def print_result(self, result, output_style=""):
         if result is None:
             # FIXME decide what to do here
             return
@@ -270,9 +267,7 @@ def print_result(self, result, output_style="", use_unicode=True):
                 print(sys.exc_info()[1])
                 return
 
-            out_str = replace_wl_with_plain_text(str(result.result), 
-                                                use_unicode=use_unicode)
-
+            out_str = str(result.result)
             if eval_type == "System`Graph":
                 out_str = "-Graph-"
             elif self.terminal_formatter:  # pygmentize

setup.py

@@ -17,20 +17,6 @@
 import os.path as osp
 from setuptools import find_packages
 
-INSTALL_REQUIRES = [
-    "Mathics-Scanner>=1.0.0dev",
-    "Mathics3 >= 2.0.0dev",
-    "click",
-    "colorama",
-    "columnize",
-    "networkx",
-    "pygments",
-    "term-background >= 1.0.1",
-]
-
-DEPENDENCY_LINKS = [
-    'http://github.com/Mathics3/mathics-scanner/tarball/master#egg=Mathics-Scanner-1.0.0dev'
-]
 
 def get_srcdir():
     filename = osp.normcase(osp.dirname(osp.abspath(__file__)))
@@ -80,8 +66,15 @@ def read(*rnames):
     package_data={
         "": ["inputrc", "inputrc-no-unicode", "inputrc-unicode", "settings/settings.m"]
     },
-    install_requires=INSTALL_REQUIRES,
-    dependency_links=DEPENDENCY_LINKS,
+    install_requires=[
+        "Mathics3 >= 2.0.0dev",
+        "click",
+        "colorama",
+        "columnize",
+        "networkx",
+        "pygments",
+        "term-background >= 1.0.1",
+    ],
     entry_points={"console_scripts": ["mathicsscript = mathicsscript.__main__:main"]},
     long_description=long_description,
     long_description_content_type="text/x-rst",