Skip to content
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

Jump to bottom

Make immediate=False the default for Butler.get #44

Merged
merged 1 commit into from
Feb 8, 2017
Merged

Make immediate=False the default for Butler.get #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions python/lsst/daf/persistence/butler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -674,7 +674,7 @@ def _locate(self, datasetType, dataId, write):
return None
return locations

def get(self, datasetType, dataId=None, immediate=False, **rest):
def get(self, datasetType, dataId=None, immediate=True, **rest):
"""Retrieves a dataset given an input collection data id.

Parameters
Expand All @@ -684,7 +684,7 @@ def get(self, datasetType, dataId=None, immediate=False, **rest):
dataId - dict
The data id.
immediate - bool
Don't use a proxy for delayed loading.
If False use a proxy for delayed loading.
**rest
keyword arguments for the data id.

Expand Down
2 changes: 1 addition & 1 deletion tests/butlerSubset.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ def testSingleIteration(self):
self.assertEqual(iterator.dataId["visit"], 654321)
else:
self.assertIn(iterator.dataId["raft"], ["1,2", "1,3"])
image = iterator.get(self.calexpTypeName) # succeeds since deferred
image = iterator.get(self.calexpTypeName, immediate=False) # succeeds since deferred
self.assertEqual(type(image), dafPersist.readProxy.ReadProxy)
image = iterator.get(self.calexpTypeName, immediate=True) # real test
self.assertEqual(type(image), list)
Expand Down