Merge pull request #1148 from mathics/opt-e

Opt e

Author: rocky

CHANGES.rst

@@ -12,6 +12,10 @@ Mathics have been split off and moved to separately installable packages. In par
 * Specific builtins involving heavy, non-standard routines were moved to pymathics modules.
 
 
+Incompatible changes:
++++++++++++++++++++++
+
+* `-e` `--execute` is better suited for embedded use. It shows just evaluation output as text.
 
 
 New builtins

mathics/main.py

@@ -109,10 +109,11 @@ def read_line(self, prompt):
             return self.rl_read_line(prompt)
         return input(prompt)
 
-    def print_result(self, result):
+    def print_result(self, result, no_out_prompt=False):
         if result is not None and result.result is not None:
             output = self.to_output(str(result.result))
-            print(self.get_out_prompt() + output + "\n")
+            mess = self.get_out_prompt() if not no_out_prompt else ""
+            print(mess + output + "\n")
 
     def rl_read_line(self, prompt):
         # Wrap ANSI colour sequences in \001 and \002, so readline
@@ -306,10 +307,9 @@ def main() -> int:
 
     if args.execute:
         for expr in args.execute:
-            print(shell.get_in_prompt() + expr)
             evaluation = Evaluation(shell.definitions, output=TerminalOutput(shell))
             result = evaluation.parse_evaluate(expr, timeout=settings.TIMEOUT)
-            shell.print_result(result)
+            shell.print_result(result, no_out_prompt=True)
             if evaluation.exc_result == Symbol("Null"):
                 exit_rc = 0
             elif evaluation.exc_result == Symbol("$Aborted"):

mathics/version.py

@@ -1,8 +1,7 @@
-#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
 
 # This file is suitable for sourcing inside POSIX shell as
 # well as importing into Python. That's why there is no
 # space around "=" below.
-__version__="2.0.0.dev0"  # noqa
+__version__="2.0.0.rc1"  # noqa