Merge pull request #680 from Mathics3/ByteArray-box

Make ByteArray more WMA compatible...

Author: rocky

mathics/builtin/binary/bytearray.py

@@ -25,15 +25,15 @@ class ByteArray(Builtin):
     </dl>
 
     >> A=ByteArray[{1, 25, 3}]
-     = ByteArray["ARkD"]
+     = ByteArray[<3>]
     >> A[[2]]
      = 25
     >> Normal[A]
      = {1, 25, 3}
     >> ToString[A]
-     = ByteArray["ARkD"]
+     = ByteArray[<3>]
     >> ByteArray["ARkD"]
-     = ByteArray["ARkD"]
+     = ByteArray[<3>]
     >> B=ByteArray["asy"]
      : The first argument in Bytearray[asy] should be a B64 enconded string or a vector of integers.
      = $Failed
@@ -57,7 +57,7 @@ def eval_str(self, string, evaluation):
 
     def eval_to_str(self, baa, evaluation):
         "ToString[ByteArray[baa_ByteArrayAtom]]"
-        return String('ByteArray["' + baa.__str__() + '"]')
+        return String(f"ByteArray[<{len(baa.value)}>]")
 
     def eval_normal(self, baa, evaluation):
         "System`Normal[ByteArray[baa_ByteArrayAtom]]"

mathics/builtin/drawing/image.py

@@ -24,15 +24,6 @@
     colorspaces as known_colorspaces,
     convert_color,
 )
-from mathics.builtin.drawing.image_internals import (
-    convolve,
-    matrix_to_numpy,
-    numpy_flip,
-    numpy_to_matrix,
-    pixels_as_float,
-    pixels_as_ubyte,
-    pixels_as_uint,
-)
 from mathics.core.atoms import (
     Atom,
     Integer,
@@ -48,6 +39,15 @@
 from mathics.core.list import ListExpression
 from mathics.core.symbols import Symbol, SymbolDivide, SymbolNull, SymbolTrue
 from mathics.core.systemsymbols import SymbolRule, SymbolSimplify
+from mathics.eval.image import (
+    convolve,
+    matrix_to_numpy,
+    numpy_flip,
+    numpy_to_matrix,
+    pixels_as_float,
+    pixels_as_ubyte,
+    pixels_as_uint,
+)
 
 SymbolColorQuantize = Symbol("ColorQuantize")
 SymbolImage = Symbol("Image")
@@ -1582,9 +1582,9 @@ def _linearize(a):
     u = numpy.unique(a)
     n = len(u)
 
-    lower = numpy.ndarray(a.shape, dtype=numpy.int)
+    lower = numpy.ndarray(a.shape, dtype=int)
     lower.fill(0)
-    upper = numpy.ndarray(a.shape, dtype=numpy.int)
+    upper = numpy.ndarray(a.shape, dtype=int)
     upper.fill(n - 1)
 
     h = numpy.sort(u)
@@ -1713,7 +1713,7 @@ def apply(self, image, stype, evaluation):
         elif stype == "Bit16":
             pixels = pixels_as_uint(pixels)
         elif stype == "Bit":
-            pixels = pixels.astype(numpy.int)
+            pixels = pixels.astype(int)
         else:
             return evaluation.message("ImageData", "pixelfmt", stype)
         return from_python(numpy_to_matrix(pixels))

mathics/builtin/list/eol.py

@@ -986,7 +986,7 @@ def eval(self, list, i, evaluation):
             return
         indices = i.get_sequence()
         # How to deal with ByteArrays
-        if list.get_head_name() == "System`ByteArray":
+        if list.get_head() is SymbolByteArray:
             list = list.evaluate(evaluation)
             if len(indices) > 1:
                 print(
@@ -995,8 +995,8 @@ def eval(self, list, i, evaluation):
                 )
                 return
             idx = indices[0]
-            if idx.get_head_name() == "System`Integer":
-                idx = idx.get_int_value()
+            if isinstance(idx, Integer):
+                idx = idx.value
                 if idx == 0:
                     return SymbolByteArray
                 data = list.elements[0].value

mathics/core/atoms.py

@@ -561,8 +561,14 @@ def __hash__(self):
     def __str__(self) -> str:
         return base64.b64encode(self.value).decode("utf8")
 
+    # FIXME: the below does not use the "f" parameter to
+    # change behavior between FullForm and OutputForm
+    # Below we have the OutputForm behavior.
+    # A refactoring should be done so that this routine
+    # is removed and the form makes decisions, rather than
+    # have this routine know everything about all forms.
     def atom_to_boxes(self, f, evaluation) -> "String":
-        res = String('""' + self.__str__() + '""')
+        res = String(f"<{len(self.value)}>")
         return res
 
     def do_copy(self) -> "ByteArrayAtom":

…thics/builtin/drawing/image_internals.py mathics/eval/image.pymathics/builtin/drawing/image_internals.py renamed to mathics/eval/image.py mathics/builtin/drawing/image_internals.py renamed to mathics/eval/image.py

@@ -1,11 +1,8 @@
 # -*- coding: utf-8 -*-
 
-"""helper functions for images
 """
-
-# Signals to Mathics doc processing not to include this module in its documentation.
-no_doc = True
-
+helper functions for images
+"""
 
 import numpy
 
@@ -63,7 +60,7 @@ def pixels_as_float(pixels):
         return pixels.astype(numpy.float32) / 255.0
     elif dtype == numpy.uint16:
         return pixels.astype(numpy.float32) / 65535.0
-    elif dtype == bool:
+    elif dtype is numpy.dtype(bool):
         return pixels.astype(numpy.float32)
     else:
         raise NotImplementedError
@@ -78,7 +75,7 @@ def pixels_as_ubyte(pixels):
         return pixels
     elif dtype == numpy.uint16:
         return (pixels / 256).astype(numpy.uint8)
-    elif dtype == numpy.bool:
+    elif dtype is numpy.dtype(bool):
         return pixels.astype(numpy.uint8) * 255
     else:
         raise NotImplementedError
@@ -93,7 +90,7 @@ def pixels_as_uint(pixels):
         return pixels.astype(numpy.uint16) * 256
     elif dtype == numpy.uint16:
         return pixels
-    elif dtype == numpy.bool:
+    elif dtype is numpy.dtype(bool):
         return pixels.astype(numpy.uint8) * 65535
     else:
         raise NotImplementedError

setup.py

@@ -47,17 +47,15 @@
 elif sys.version_info[:2] == (3, 6):
     INSTALL_REQUIRES += [
         "recordclass",
-        "numpy<1.24",
+        "numpy",
         "llvmlite<0.37",
         "sympy>=1.8,<1.9",
     ]
     if is_PyPy:
         print("Mathics does not support PyPy Python 3.6" % sys.version_info[:2])
         sys.exit(-1)
-elif sys.version_info[:2] == (3, 7):
-    INSTALL_REQUIRES += ["numpy<1.22", "llvmlite", "sympy>=1.8, < 1.11"]
 else:
-    INSTALL_REQUIRES += ["numpy<1.24", "llvmlite", "sympy>=1.8, < 1.11"]
+    INSTALL_REQUIRES += ["numpy<=1.24", "llvmlite", "sympy>=1.8, < 1.11"]
 
 if not is_PyPy:
     INSTALL_REQUIRES += ["recordclass"]