Skip to content

Commit 04808ce

Browse files
blob now accepts native complex scalars
1 parent fe461a2 commit 04808ce

File tree

2 files changed

+5
-7
lines changed

2 files changed

+5
-7
lines changed

datajoint/blob.py

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -152,10 +152,8 @@ def pack_blob(self, obj):
152152
return self.pack_array(np.array(obj))
153153
if isinstance(obj, (bool, np.bool, np.bool_)):
154154
return self.pack_array(np.array(obj))
155-
if isinstance(obj, float):
156-
return self.pack_array(np.array(obj, dtype=np.float64))
157-
if isinstance(obj, int):
158-
return self.pack_array(np.array(obj, dtype=np.int64))
155+
if isinstance(obj, (float, int, complex)):
156+
return self.pack_array(np.array(obj))
159157
if isinstance(obj, (datetime.datetime, datetime.date, datetime.time)):
160158
return self.pack_datetime(obj)
161159
if isinstance(obj, Decimal):
@@ -253,9 +251,6 @@ def pack_recarray(self, array):
253251
def read_sparse_array(self):
254252
raise DataJointError('datajoint-python does not yet support sparse arrays. Issue (#590)')
255253

256-
def read_scalar(selfs):
257-
258-
259254
def read_decimal(self):
260255
return Decimal(self.read_string())
261256

tests/test_blob.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ def test_pack():
2323
x = np.random.randn(10)
2424
assert_array_equal(x, unpack(pack(x)), "Arrays do not match!")
2525

26+
x = 7j
27+
assert_equal(x, unpack(pack(x)), "Complex scalar does not match")
28+
2629
x = np.float32(np.random.randn(3, 4, 5))
2730
assert_array_equal(x, unpack(pack(x)), "Arrays do not match!")
2831

0 commit comments

Comments
 (0)