merging rocky's nintegrate-rebase

Author: mmatera

CHANGES.rst

@@ -1,69 +1,55 @@
 CHANGES
 =======
 
-<<<<<<< HEAD
-
-2.0.1
------
-
-General improvements
---------------------
-- Consistency version checks for builtin modules at load time
-- Partial improvement in Compile: now every expression has a compiled form,
-  as a Python function.
-- Automatic detection for the best strategy to numeric evaluation of constants.
-New builtins
-------------
-
-- NIntegrate
-- ArcTanh
-
-Bug fixes
----------
-- TeXForm for integrals are now properly formatted.
-
-
-Pymathics Modules
-------------------
-- Pymathics modules now can run initialization code when are loaded.
-- The `builtins` list is not hardliked to the library anymore. This simplifies
-  the loading and reloading of pymathics modules.
-- Decoupling of BoxConstructors from the library. Now are defined at the
-  level of the definition objects. This is useful for customizing the
-  Graphics output if it is available.
-  
-
-
-
-=======
 2.1.0
 -----
 
-  New builtins
-++++++++++++++
+New builtins
+++++++++++++
 
+* ``ArcTanh``
 * ``ByteArray``
-* ``FileNames``
 * ``CreateFile``
 * ``CreateTemporary``
-
+* ``FileNames``
+* ``NIntegrate``
 
 Enhancements
 ++++++++++++
 
+* the Mathics version is checked for builtin modules at load time. A message is given when a builtin doesn't load.
+* Automatic detection for the best strategy to numeric evaluation of constants.
 * ``FileNameJoin`` - implement ``OperatingSystem`` option
 * Mathics functions are accepted by ``Compile[]``. The return value or type will be
-  ``CompiledFunction``
+  ``Compiled[] and CompiledFunction[]``  every expression can have a compiled form,
+  as a Python function.
 * ``EqualQ[]`` now compares complex against other numbers properly.
 
+
+Bug fixes
++++++++++
+
+* TeXForm for integrals are now properly formatted.
+
+
+Pymathics Modules
++++++++++++++++++
+
+* Pymathics modules now can run initialization code when are loaded.
+* The ``builtins`` list is not hardliked to the library anymore. This simplifies
+  the loading and reloading of pymathics modules.
+* Decoupling of BoxConstructors from the library. Now are defined at the
+  level of the definition objects. This is useful for customizing the
+  Graphics output if it is available.
+
+
 Miscellanea
 +++++++++++
 
 * A pass was made to improve Microsoft Windows compatability and testing
 Windows under MSYS.
 * Include numpy version in version string. Show in CLI
 * Small CLI tweaks ``--colors=None`` added to match mathicsscript.
->>>>>>> upstream/master
 
 2.0.0
 -----

mathics/builtin/compilation.py

@@ -141,7 +141,7 @@ def _pythonized_mathics_expr(*x):
 
                 # TODO: check if we can use numba to compile this...
                 cfunc = _pythonized_mathics_expr
-            except Exception as e:
+            except Exception:
                 cfunc = None
 
         if cfunc is None:
@@ -250,6 +250,5 @@ def apply(self, argnames, expr, code, args, evaluation):
         try:
             result = code.cfunc(*py_args)
         except (TypeError, ctypes.ArgumentError):
-            evaluation.message("CompiledFunction", "argerr", args)
-            return
+            return evaluation.message("CompiledFunction", "argerr", args)
         return from_python(result)

mathics/core/expression.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python3
 # cython: language_level=3
 # -*- coding: utf-8 -*-
 
@@ -1472,7 +1471,6 @@ def boxes_to_xml(self, **options) -> str:
         is_style, options = self.process_style_box(options)
         if is_style:
             return self._leaves[0].boxes_to_xml(**options)
-        head = self._head
         name = self._head.get_name()
         if (
             name == "System`RowBox"