daf_persistence remove butler object cache #58
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
andy-slac
approved these changes
May 19, 2017
| @@ -1094,37 +1088,12 @@ def _read(self, location): | |||
| Returns | |||
| ------- | |||
| object - an instance of the object specified by the butlerLoction. | |||
There was a problem hiding this comment.
butlerLoction -> butlerLocation (or should it be just location)
| self.log.debug("Starting read from %s", location) | ||
| results = location.repository.read(location) | ||
| if len(results) == 1: | ||
| results = results[0] |
There was a problem hiding this comment.
I remember reviewing piece of code where you did something like:
if isinstance(results, (list, tuple)) and len(results) == 1:
results = results[0]
to protect against cases when user type is a sequence-like object. Should not this logic apply here too?
There was a problem hiding this comment.
it's a good idea. but, in this case the the code is moved out one indent level but is otherwise the same as it ever has been, and I don't want to get into the implications of reading from a maybe-list.
There was a problem hiding this comment.
Is it safer to try the indexing in a try block, and make results a list if it throws?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.