remove ScalarWrapper usage

Author: brokkoli71

src/zarr/core/buffer/core.py

@@ -552,7 +552,7 @@ def as_numpy_array(self) -> npt.NDArray[Any]:
         """
         ...
 
-    def as_scalar(self) -> ScalarWrapper:
+    def as_scalar(self) -> np.generic:
         """Returns the buffer as a scalar value
 
         Returns
@@ -561,7 +561,7 @@ def as_scalar(self) -> ScalarWrapper:
         """
         if self._data.size != 1:
             raise ValueError("Buffer does not contain a single scalar value")
-        return ScalarWrapper(self.as_numpy_array().item(), np.dtype(self.dtype))
+        return self.dtype.type(self.as_numpy_array().item())
 
     @property
     def dtype(self) -> np.dtype[Any]:

tests/test_array.py

@@ -35,8 +35,7 @@
     chunks_initialized,
     create_array,
 )
-from zarr.core.buffer import NDArrayLike, default_buffer_prototype
-from zarr.core.buffer.core import ScalarWrapper
+from zarr.core.buffer import default_buffer_prototype
 from zarr.core.buffer.cpu import NDBuffer
 from zarr.core.chunk_grids import _auto_partition
 from zarr.core.common import JSON, MemoryOrder, ZarrFormat
@@ -1335,8 +1334,8 @@ def test_scalar_array(value: Any, zarr_format: ZarrFormat) -> None:
     assert arr.ndim == 0
 
     x = arr[()]
-    assert isinstance(arr[()], ScalarWrapper)
-    assert isinstance(arr[()], NDArrayLike)
+    assert isinstance(arr[()], np.generic)
+    # assert isinstance(arr[()], NDArrayLike)
     assert x.shape == arr.shape
     assert x.ndim == arr.ndim
 

tests/test_buffer.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
-import re
-from typing import TYPE_CHECKING, Any
+from typing import TYPE_CHECKING
 
 import numpy as np
 import pytest
@@ -32,7 +31,6 @@
 
 
 import zarr.api.asynchronous
-from zarr.core.buffer.core import ScalarWrapper
 
 if TYPE_CHECKING:
     import types
@@ -44,54 +42,6 @@ def test_nd_array_like(xp: types.ModuleType) -> None:
     assert isinstance(ary, NDArrayLike)
 
 
-@pytest.mark.parametrize("value", [1, 1.4, "a", b"a", np.array(1), False, True])
-def test_scalar_wrapper(value: Any) -> None:
-    x = ScalarWrapper(value)
-    assert x == value
-    assert value == x
-    assert x == x[()]
-    assert x.view(str) == x
-    assert x.copy() == x
-    assert x.transpose() == x
-    assert x.ravel() == x
-    assert x.all() == bool(value)
-    if isinstance(value, (int, float)):
-        assert -x == -value
-        assert abs(x) == abs(value)
-        assert int(x) == int(value)
-        assert float(x) == float(value)
-        assert complex(x) == complex(value)
-        assert x + 1 == value + 1
-        assert x - 1 == value - 1
-        assert x * 2 == value * 2
-        assert x / 2 == value / 2
-        assert x // 2 == value // 2
-        assert x % 2 == value % 2
-        assert x**2 == value**2
-        assert x == value
-        assert x != value + 1
-        assert bool(x) == bool(value)
-        assert hash(x) == hash(value)
-        assert str(x) == str(value)
-        assert format(x, "") == format(value, "")
-        x.fill(2)
-        x[()] += 1
-        assert x == 3
-    elif isinstance(value, str):
-        assert str(x) == value
-        with pytest.raises(TypeError, match=re.escape("bad operand type for abs(): 'str'")):
-            abs(x)
-
-    with pytest.raises(ValueError, match="Cannot reshape scalar to non-scalar shape."):
-        x.reshape((1, 2))
-    with pytest.raises(IndexError, match="Invalid index for scalar."):
-        x[10] = value
-    with pytest.raises(IndexError, match="Invalid index for scalar."):
-        x[10]
-    with pytest.raises(TypeError, match=re.escape("len() of unsized object.")):
-        len(x)
-
-
 @pytest.mark.asyncio
 async def test_async_array_prototype() -> None:
     """Test the use of a custom buffer prototype"""