diff --git a/mathics/eval/arithmetic.py b/mathics/eval/arithmetic.py index 9b512ade3..37c24267d 100644 --- a/mathics/eval/arithmetic.py +++ b/mathics/eval/arithmetic.py @@ -32,24 +32,18 @@ from mathics.core.element import BaseElement, ElementsProperties from mathics.core.expression import Expression from mathics.core.number import FP_MANTISA_BINARY_DIGITS, SpecialValueError, min_prec - from mathics.core.rules import Rule -from mathics.core.symbols import Atom, Symbol +from mathics.core.symbols import Atom from mathics.core.systemsymbols import ( SymbolAbs, - SymbolComplexInfinity, SymbolE, SymbolEulerGamma, SymbolExp, SymbolI, - SymbolIndeterminate, SymbolKhinchin, SymbolLog, SymbolPi, - SymbolPlus, - SymbolPower, SymbolSign, - SymbolTimes, ) # FIXME: replace by numpy constants: @@ -221,7 +215,6 @@ def eval_Sign(expr: BaseElement) -> Optional[BaseElement]: return Expression(SymbolTimes, expr, norm) return result return None - def eval_Sign_number(n: Number) -> Number: @@ -763,6 +756,7 @@ def eval_inverse_number(n: Number) -> Number: # Otherwise, use power.... return eval_Power_number(n, IntegerM1) + def eval_multiply_numbers(*numbers: List[Number]) -> Number: """ Multiply the elements in ``numbers``. @@ -819,8 +813,7 @@ def flat_arithmetic_operators(expr: Expression) -> Expression: return Expression(head, *items[True], *items[False]) - - def segregate_numbers( +def segregate_numbers( *elements: BaseElement, ) -> Tuple[List[Number], List[BaseElement]]: """ diff --git a/mathics/eval/image.py b/mathics/eval/image.py index 18bb6dee6..dd5fb6791 100644 --- a/mathics/eval/image.py +++ b/mathics/eval/image.py @@ -92,7 +92,6 @@ def extract_exif(image, evaluation: Evaluation) -> Optional[Expression]: Return None if there is no Exif information. """ if hasattr(image, "getexif"): - # PIL seems to have a bug in getting v2_tags, # specifically tag offsets because # it expects image.fp to exist and for us it diff --git a/mathics/eval/parts.py b/mathics/eval/parts.py index 3ecf356d1..61a1adf33 100644 --- a/mathics/eval/parts.py +++ b/mathics/eval/parts.py @@ -6,7 +6,7 @@ from typing import List -from mathics.core.atoms import Integer, Integer1 +from mathics.core.atoms import Integer from mathics.core.convert.expression import make_expression from mathics.core.element import BaseElement, BoxElementMixin from mathics.core.exceptions import ( @@ -20,11 +20,7 @@ from mathics.core.list import ListExpression from mathics.core.subexpression import SubExpression from mathics.core.symbols import Atom, Symbol, SymbolList -from mathics.core.systemsymbols import ( - SymbolDirectedInfinity, - SymbolInfinity, - SymbolNothing, -) +from mathics.core.systemsymbols import SymbolInfinity, SymbolNothing from mathics.eval.patterns import Matcher diff --git a/mathics/eval/testing_expressions.py b/mathics/eval/testing_expressions.py index c15471f48..cab4a7d4b 100644 --- a/mathics/eval/testing_expressions.py +++ b/mathics/eval/testing_expressions.py @@ -13,7 +13,6 @@ def cmp(a, b) -> int: def do_cmp(x1, x2) -> Optional[int]: - # don't attempt to compare complex numbers for x in (x1, x2): # TODO: Send message General::nord