Skip to content

replace object identity with equality in blob #175

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Dec 2, 2015
Merged

replace object identity with equality in blob #175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3b5356d
replace object identity with equality in blob
fabiansinz Dec 1, 2015
c340c80
Merge branch 'master' of https://github.com/fabiansinz/datajoint-python
fabiansinz Dec 1, 2015
8303233
fix datetime test
fabiansinz Dec 1, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion datajoint/blob.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ def pack(obj):
obj, imaginary = np.real(obj), np.imag(obj)

type_number = reverseClassID[obj.dtype]
assert dtypeList[type_number] is obj.dtype, 'ambigous or unknown array type'
assert dtypeList[type_number] == obj.dtype, 'ambigous or unknown array type'
blob += np.asarray(type_number, dtype=np.uint32).tostring()
blob += np.int8(is_complex).tostring() + b'\0\0\0'
blob += obj.tostring()
Expand Down
8 changes: 4 additions & 4 deletions tests/test_relational_operand.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,8 +176,8 @@ def test_restrictions_by_lists():

def test_datetime(self):
"""Test date retrieval"""
Experiment().populate()
e1 = Experiment() & dict(experiment_date='2015-11-20')
e2 = Experiment() & dict(experiment_date=datetime.date(2015, 11, 20))
date = Experiment().fetch['experiment_date'][0]

assert_true(len(e1) == len(e2) == 7, 'Two date restriction do not yield the same result')
e1 = Experiment() & dict(experiment_date=str(date))
e2 = Experiment() & dict(experiment_date=date)
assert_true(len(e1) == len(e2) > 0, 'Two date restriction do not yield the same result')