Merge remote-tracking branch 'upstream/master' into improvestringsplit

Author: mmatera

mathics/benchmark.py

@@ -26,34 +26,39 @@
 
 # Mathics expressions to benchmark
 BENCHMARKS = {
-    'Arithmetic': ['1 + 2', '5 * 3'],
-    'Plot': [
-        'Plot[0, {x, -3, 3}]',
-        'Plot[x^2 + x + 1, {x, -3, 3}]',
-        'Plot[Sin[Cos[x^2]], {x, -3, 3}]',
-        'Plot[Sin[100 x], {x, -3, 3}]'],
-    'Plot3D': [
-        'Plot3D[0, {x, -1, 1}, {y, -1, 1}]',
-        'Plot3D[x + y^2, {x, -3, 3}, {y, -2, 2}]',
-        'Plot3D[Sin[x + y^2], {x, -3, 3}, {y, -3, 3}]',
-        'Plot3D[Sin[100 x + 100 y ^ 2], {x, 0, 1}, {y, 0, 1}]'],
-    'DensityPlot': [
-        'DensityPlot[x + y^2, {x, -3, 3}, {y, -2, 2}]'],
-    'Trig': [
-        'Sin[RandomReal[]]', 'ArcTan[RandomReal[]]'],
-    'Random': [
-        'RandomInteger[{-100, 100}, 100]',
-        'RandomInteger[10, {10, 10}]',
-        'RandomInteger[{0,1}, {5, 5, 5}]',
-        'RandomReal[1, 100]', 'RandomReal[{-1, 1}, 100]',
-        'RandomComplex[2 + I, 50]',
-        'RandomComplex[{-1 - I, 1 + I}, {10, 10}]'],
-    'Expand': [
-        'Expand[(a1+a2)^200]', 'Expand[(a1+a2+a3)^25]',
-        'Expand[(a1+a2+a3+a4+a5+a6+a7)^3]'],
-    'Matrix': [
-        'RandomInteger[{0,1}, {10,10}] . RandomInteger[{0,1}, {10,10}]',
-        'RandomInteger[{0,10}, {10,10}] + RandomInteger[{0,10}, {10,10}]'],
+    "Arithmetic": ["1 + 2", "5 * 3"],
+    "Plot": [
+        "Plot[0, {x, -3, 3}]",
+        "Plot[x^2 + x + 1, {x, -3, 3}]",
+        "Plot[Sin[Cos[x^2]], {x, -3, 3}]",
+        "Plot[Sin[100 x], {x, -3, 3}]",
+    ],
+    "Plot3D": [
+        "Plot3D[0, {x, -1, 1}, {y, -1, 1}]",
+        "Plot3D[x + y^2, {x, -3, 3}, {y, -2, 2}]",
+        "Plot3D[Sin[x + y^2], {x, -3, 3}, {y, -3, 3}]",
+        "Plot3D[Sin[100 x + 100 y ^ 2], {x, 0, 1}, {y, 0, 1}]",
+    ],
+    "DensityPlot": ["DensityPlot[x + y^2, {x, -3, 3}, {y, -2, 2}]"],
+    "Trig": ["Sin[RandomReal[]]", "ArcTan[RandomReal[]]"],
+    "Random": [
+        "RandomInteger[{-100, 100}, 100]",
+        "RandomInteger[10, {10, 10}]",
+        "RandomInteger[{0,1}, {5, 5, 5}]",
+        "RandomReal[1, 100]",
+        "RandomReal[{-1, 1}, 100]",
+        "RandomComplex[2 + I, 50]",
+        "RandomComplex[{-1 - I, 1 + I}, {10, 10}]",
+    ],
+    "Expand": [
+        "Expand[(a1+a2)^200]",
+        "Expand[(a1+a2+a3)^25]",
+        "Expand[(a1+a2+a3+a4+a5+a6+a7)^3]",
+    ],
+    "Matrix": [
+        "RandomInteger[{0,1}, {10,10}] . RandomInteger[{0,1}, {10,10}]",
+        "RandomInteger[{0,10}, {10,10}] + RandomInteger[{0,10}, {10,10}]",
+    ],
 }
 
 DEPTH = 300
@@ -63,10 +68,10 @@
     ";".join(map(str, range(1, DEPTH))),
     "/".join(map(str, range(1, DEPTH))),
     "^".join(map(str, range(1, DEPTH))),
-    "! " * DEPTH + 'expr',
-    "!" * DEPTH + 'expr',
-    'expr' + "& " * DEPTH,
-    "Sin[" * DEPTH + '0.5' + "]" * DEPTH,
+    "! " * DEPTH + "expr",
+    "!" * DEPTH + "expr",
+    "expr" + "& " * DEPTH,
+    "Sin[" * DEPTH + "0.5" + "]" * DEPTH,
 ]
 
 definitions = Definitions(add_builtin=True)
@@ -108,14 +113,17 @@ def timeit(func, repeats=None):
 
     times.append(time.process_time())
 
-    times = [times[i+1] - times[i] for i in range(repeats)]
+    times = [times[i + 1] - times[i] for i in range(repeats)]
 
     average_time = format_time_units(mean(times))
     best_time = format_time_units(min(times))
     median_time = format_time_units(median(times))
 
-    print("    {0:5n} loops, avg: {1}, best: {2}, median: {3} per loop".format(
-        repeats, average_time, best_time, median_time))
+    print(
+        "    {0:5n} loops, avg: {1}, best: {2}, median: {3} per loop".format(
+            repeats, average_time, best_time, median_time
+        )
+    )
 
 
 def truncate_line(string):
@@ -133,16 +141,17 @@ def benchmark_parse_file(fname):
     try:
         import urllib.request
     except ImportError:
-        print('install urllib for Combinatorica parsing test')
+        print("install urllib for Combinatorica parsing test")
         return
     print("  '{0}'".format(truncate_line(fname)))
     with urllib.request.urlopen(fname) as f:
-        code = f.read().decode('utf-8')
+        code = f.read().decode("utf-8")
 
     def do_parse():
         feeder = MathicsMultiLineFeeder(code)
         while not feeder.empty():
             parse(definitions, feeder)
+
     timeit(do_parse)
 
 
@@ -151,7 +160,8 @@ def benchmark_parser():
     for expression_string in PARSING_BENCHMARKS:
         benchmark_parse(expression_string)
     benchmark_parse_file(
-        'http://www.cs.uiowa.edu/~sriram/Combinatorica/NewCombinatorica.m')
+        "http://www.cs.uiowa.edu/~sriram/Combinatorica/NewCombinatorica.m"
+    )
 
 
 def benchmark_format(expression_string):
@@ -181,30 +191,37 @@ def benchmark_all_sections():
 
 def main():
     global evaluation, TESTS_PER_BENCHMARK
-    parser = ArgumentParser(
-        description="Mathics benchmark suite.", add_help=False)
+    parser = ArgumentParser(description="Mathics benchmark suite.", add_help=False)
 
     parser.add_argument(
-        '--help', '-h', help='show this help message and exit', action='help')
+        "--help", "-h", help="show this help message and exit", action="help"
+    )
 
     parser.add_argument(
-        '--version', '-v', action='version',
-        version='%(prog)s ' + mathics.__version__)
+        "--version", "-v", action="version", version="%(prog)s " + mathics.__version__
+    )
 
     parser.add_argument(
-        '--section', '-s', dest="section", metavar="SECTION",
-        help="only test SECTION")
+        "--section", "-s", dest="section", metavar="SECTION", help="only test SECTION"
+    )
 
-    parser.add_argument(
-        '-p', '--parser', action='store_true', help="only test parser")
+    parser.add_argument("-p", "--parser", action="store_true", help="only test parser")
 
     parser.add_argument(
-        '--expression', '-e', dest="expression", metavar="EXPRESSION",
-        help="benchmark a valid Mathics expression")
+        "--expression",
+        "-e",
+        dest="expression",
+        metavar="EXPRESSION",
+        help="benchmark a valid Mathics expression",
+    )
 
     parser.add_argument(
-        '--number', '-n', dest="repeat", metavar="REPEAT",
-        help="loop REPEAT number of times")
+        "--number",
+        "-n",
+        dest="repeat",
+        metavar="REPEAT",
+        help="loop REPEAT number of times",
+    )
 
     args = parser.parse_args()
 
@@ -221,5 +238,6 @@ def main():
         benchmark_all_sections()
         benchmark_parser()
 
-if __name__ == '__main__':
+
+if __name__ == "__main__":
     main()

mathics/main.py

@@ -249,7 +249,11 @@ def main() -> int:
         "multiple times)",
     )
 
-    argparser.add_argument("--colors", nargs="?", help="interactive shell colors. Use value 'NoColor' or 'None' to disable ANSI color decoration")
+    argparser.add_argument(
+        "--colors",
+        nargs="?",
+        help="interactive shell colors. Use value 'NoColor' or 'None' to disable ANSI color decoration",
+    )
 
     argparser.add_argument(
         "--no-completion", help="disable tab completion", action="store_true"
@@ -378,5 +382,6 @@ def main() -> int:
             shell.reset_lineno()
     return exit_rc
 
+
 if __name__ == "__main__":
     sys.exit(main())

mathics/profile_mathics.py

@@ -14,6 +14,7 @@
 def prepare():
     pass
 
+
 result = None
 
 
@@ -30,20 +31,21 @@ def run():
         #     'Plus@@f/@Symbol/@StringJoin/@Tuples[CharacterRange["a","z"],2]')
         # prompt = 'FullForm[Nest[1+Sqrt[1+#]&, x, 20]]'
         # prompt = '1+2'
-        prompt = 'DensityPlot[x*y,{x,-1,1},{y,-1,1}]'
-        evaluation = Evaluation(definitions, format='xml')
+        prompt = "DensityPlot[x*y,{x,-1,1},{y,-1,1}]"
+        evaluation = Evaluation(definitions, format="xml")
         result = evaluation.parse_evaluate(prompt)
     except KeyboardInterrupt:
-        result = 'INTERRUPTED'
+        result = "INTERRUPTED"
 
 
 def _profile():
     global result
     prepare()
-    cProfile.run('run()', 'profile')
-    p = pstats.Stats('profile')
-    p.sort_stats('cumulative').print_stats(50)
+    cProfile.run("run()", "profile")
+    p = pstats.Stats("profile")
+    p.sort_stats("cumulative").print_stats(50)
     p.print_callees(20)
 
-if __name__ == '__main__':
+
+if __name__ == "__main__":
     _profile()

mathics/session.py

@@ -7,11 +7,13 @@
 class MathicsSession:
     def __init__(self, add_builtin=True, catch_interrupt=False, form="InputForm"):
         self.definitions = Definitions(add_builtin)
-        self.evaluation = Evaluation(definitions=self.definitions, catch_interrupt=catch_interrupt)
+        self.evaluation = Evaluation(
+            definitions=self.definitions, catch_interrupt=catch_interrupt
+        )
         self.form = form
         self.last_result = None
 
-    def evaluate(self, str_expression, timeout = None, form=None):
+    def evaluate(self, str_expression, timeout=None, form=None):
         expr = parse(self.definitions, MathicsSingleLineFeeder(str_expression))
         if form is None:
             form = self.form
@@ -20,11 +22,9 @@ def evaluate(self, str_expression, timeout = None, form=None):
 
     def format_result(self, str_expression=None, timeout=None, form=None):
         if str_expression:
-            self.evaluate(str_expression, timeout = None, form=None)
+            self.evaluate(str_expression, timeout=None, form=None)
 
         res = self.last_result
         if form is None:
             form = self.form
         return self.last_result.do_format(self.evaluation, form)
-
-

mathics/settings.py

@@ -30,37 +30,35 @@
 # historically 10000 was used on public mathics servers
 MAX_STORED_SIZE = 10000
 
-ADMINS = (
-    ('Admin', '[email protected]'),
-)
+ADMINS = (("Admin", "[email protected]"),)
 MANAGERS = ADMINS
 
-ROOT_DIR = pkg_resources.resource_filename('mathics', '')
-if sys.platform.startswith('win'):
-    DATA_DIR = os.environ['APPDATA'].replace(os.sep, '/') + '/Python/Mathics/'
+ROOT_DIR = pkg_resources.resource_filename("mathics", "")
+if sys.platform.startswith("win"):
+    DATA_DIR = os.environ["APPDATA"].replace(os.sep, "/") + "/Python/Mathics/"
 else:
-    DATA_DIR = path.expanduser('~/.local/var/mathics/')
+    DATA_DIR = path.expanduser("~/.local/var/mathics/")
 # if not path.exists(DATA_DIR):
 #    os.makedirs(DATA_DIR)
 
-DOC_DIR = os.path.join(ROOT_DIR, 'doc/documentation/')
-DOC_TEX_DATA = os.path.join(ROOT_DIR, 'doc/tex/data')
-DOC_XML_DATA = os.path.join(ROOT_DIR, 'doc/xml/data')
-DOC_LATEX_FILE = os.path.join(ROOT_DIR, 'doc/tex/documentation.tex')
+DOC_DIR = os.path.join(ROOT_DIR, "doc/documentation/")
+DOC_TEX_DATA = os.path.join(ROOT_DIR, "doc/tex/data")
+DOC_XML_DATA = os.path.join(ROOT_DIR, "doc/xml/data")
+DOC_LATEX_FILE = os.path.join(ROOT_DIR, "doc/tex/documentation.tex")
 
 # Local time zone for this installation. Choices can be found here:
 # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
 # although not all choices may be available on all operating systems.
 # If running in a Windows environment this must be set to the same as your
 # system time zone.
-TIME_ZONE = 'Europe/Vienna'
+TIME_ZONE = "Europe/Vienna"
 
 # Set this True if you prefer 12 hour time to be the default
 TIME_12HOUR = False
 
 # Language code for this installation. All choices can be found here:
 # http://www.i18nguy.com/unicode/language-identifiers.html
-LANGUAGE_CODE = 'en-us'
+LANGUAGE_CODE = "en-us"
 
 SITE_ID = 1
 
@@ -72,4 +70,4 @@
 # whatever it is that setting this thing did.
 default_pymathics_modules = []
 
-SYSTEM_CHARACTER_ENCODING = "UTF-8" if sys.getdefaultencoding()=='utf-8' else 'ASCII'
+SYSTEM_CHARACTER_ENCODING = "UTF-8" if sys.getdefaultencoding() == "utf-8" else "ASCII"