Use numbers instead of numpy module

Author: ericpre

zarr/tests/test_util.py

@@ -244,8 +244,7 @@ def test_all_equal():
 
 def test_json_dumps_numpy_dtype():
     assert json_dumps(np.int64(0)) == json_dumps(0)
-    assert json_dumps(np.float64(0)) == json_dumps(float(0))
-    assert json_dumps(np.array([0, 1])) == json_dumps([0, 1])
+    assert json_dumps(np.float32(0)) == json_dumps(float(0))
     # Check that we raise the error of the superclass for unsupported object
     with pytest.raises(TypeError):
         json_dumps(Array)

zarr/util.py

@@ -33,23 +33,22 @@ def flatten(arg: Iterable) -> Iterable:
 }
 
 
-class NumpyEncoder(json.JSONEncoder):
+class NumberEncoder(json.JSONEncoder):
 
     def default(self, o):
         # See json.JSONEncoder.default docstring for explanation
-        if isinstance(o, np.integer):
+        # This is necessary to encode numpy dtype
+        if isinstance(o, numbers.Integral):
             return int(o)
-        if isinstance(o, np.floating):
+        if isinstance(o, numbers.Real):
             return float(o)
-        if isinstance(o, np.ndarray):
-            return o.tolist()
         return json.JSONEncoder.default(self, o)
 
 
 def json_dumps(o: Any) -> bytes:
     """Write JSON in a consistent, human-readable way."""
     return json.dumps(o, indent=4, sort_keys=True, ensure_ascii=True,
-                      separators=(',', ': '), cls=NumpyEncoder).encode('ascii')
+                      separators=(',', ': '), cls=NumberEncoder).encode('ascii')
 
 
 def json_loads(s: str) -> Dict[str, Any]: