Skip to content

Commit

Permalink
Make immediate=False the default for Butler.get
Browse files Browse the repository at this point in the history
  • Loading branch information
r-owen committed Feb 8, 2017
1 parent 9654cba commit ca55c5b
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions python/lsst/daf/persistence/butler.py
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
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

0 comments on commit ca55c5b

Please sign in to comment.