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

Author: mmatera

mathics/builtin/arithmetic.py

@@ -11,7 +11,6 @@
 
 import sympy
 import mpmath
-import math
 
 from mathics.builtin.base import (
     Builtin,
@@ -1350,7 +1349,7 @@ def apply(self, expr, evaluation):
         # try expanding the expression
             exprexp = Expression("ExpandAll", expr).evaluate(evaluation)
             exprexp = exprexp.to_sympy()
-            result = _iszero(exprexp)        
+            result = _iszero(exprexp)
         if result is None:
             # Can't get exact answer, so try approximate equal
             numeric_val = Expression("N", expr).evaluate(evaluation)

mathics/builtin/base.py

@@ -1,14 +1,12 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
-import mpmath
 import re
 import sympy
 
 from functools import total_ordering
 import importlib
 from itertools import chain
-
 import typing
 from typing import Any, cast
 
@@ -531,7 +529,7 @@ def apply(self, expr, evaluation) -> Symbol:
 
 
 class SympyFunction(SympyObject):
-    def get_constant(self, precision, have_mpmath=False):
+    def get_constant(self, precision, evaluation, have_mpmath=False):
         try:
             d = get_precision(precision, evaluation)
         except PrecisionValueError:

mathics/builtin/calculus.py

@@ -369,7 +369,7 @@ class Integrate(SympyFunction):
 
     Integration in TeX:
     >> Integrate[f[x], {x, a, b}] // TeXForm
-     = \int_a^bf\left[x\right] \, dx
+     = \int_a^b f\left[x\right] \, dx
 
     #> DownValues[Integrate]
      = {}
@@ -437,12 +437,12 @@ class Integrate(SympyFunction):
         'Integrate[list_List, x_]': 'Integrate[#, x]& /@ list',
 
         'MakeBoxes[Integrate[f_, x_], form:StandardForm|TraditionalForm]':
-        r'''RowBox[{"\[Integral]", MakeBoxes[f, form], "\[InvisibleTimes]",
+        r'''RowBox[{"\[Integral]","\[InvisibleTimes]", MakeBoxes[f, form], "\[InvisibleTimes]",
                 RowBox[{"\[DifferentialD]", MakeBoxes[x, form]}]}]''',
         'MakeBoxes[Integrate[f_, {x_, a_, b_}], '
         'form:StandardForm|TraditionalForm]':
         r'''RowBox[{SubsuperscriptBox["\[Integral]", MakeBoxes[a, form],
-                MakeBoxes[b, form]], MakeBoxes[f, form], "\[InvisibleTimes]",
+                MakeBoxes[b, form]], "\[InvisibleTimes]" , MakeBoxes[f, form], "\[InvisibleTimes]",
                 RowBox[{"\[DifferentialD]", MakeBoxes[x, form]}]}]''',
     }
 

mathics/builtin/datentime.py

@@ -149,7 +149,7 @@ class TimeConstrained(Builtin):
 
     Possible issues: for certain time-consuming functions (like simplify)
     which are based on sympy or other libraries, it is possible that
-    the evaluation continues after the timeout. However, at the end of the evaluation, the function will return $\$Aborted$ and the results will not affect
+    the evaluation continues after the timeout. However, at the end of the evaluation, the function will return $\\$Aborted$ and the results will not affect
     the state of the mathics kernel.
 
     """

mathics/core/definitions.py

@@ -157,6 +157,12 @@ def load_pymathics_module(self, module, remove_on_quit=True):
         for name, item in newsymbols.items():
             if name != "System`MakeBoxes":
                 item.contribute(self, is_pymodule=True)
+
+
+        onload = loaded_module.pymathics_version_data.get("onload", None)
+        if onload:
+            onload(self)
+            
         return loaded_module
 
     def clear_pymathics_modules(self):

mathics/core/expression.py

@@ -2,11 +2,9 @@
 # cython: language_level=3
 # -*- coding: utf-8 -*-
 
-import ast
 import sympy
 import mpmath
 import math
-import inspect
 import re
 
 import typing
@@ -141,7 +139,7 @@ def from_python(arg):
 
 class KeyComparable(object):
     def get_sort_key(self):
-        raise NotImplemented
+        raise NotImplementedError
 
     def __lt__(self, other) -> bool:
         return self.get_sort_key() < other.get_sort_key()
@@ -381,7 +379,7 @@ def do_format(self, evaluation, form):
             leaves = self.get_leaves()
             include_form = False
             # If the expression is enclosed by a Format
-            # takes the form from the expression and 
+            # takes the form from the expression and
             # removes the format from the expression.
             if head in formats and len(leaves) == 1:
                 expr = leaves[0]
@@ -432,7 +430,7 @@ def format_expr(expr):
                     if result is not None and result != expr:
                         return result.evaluate(evaluation)
                 return None
-            
+
             formatted = format_expr(expr)
             if formatted is not None:
                 result = formatted.do_format(evaluation, form)
@@ -2137,7 +2135,7 @@ def __neg__(self) -> 'Rational':
 
     @property
     def is_zero(self) -> bool:
-        return self.numerator().is_zero and not self.denominator().is_zero()
+        return self.numerator().is_zero # (implicit) and not (self.denominator().is_zero)
 
 
 class Real(Number):