From c81846305166a9e73c2adbd8eb8090ddac2af2ad Mon Sep 17 00:00:00 2001 From: Scott Sanderson Date: Thu, 29 Oct 2015 12:06:14 -0400 Subject: [PATCH] MAINT: Simplify conditional. --- zipline/assets/assets.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/zipline/assets/assets.py b/zipline/assets/assets.py index 8d059072..a386b5f6 100644 --- a/zipline/assets/assets.py +++ b/zipline/assets/assets.py @@ -146,12 +146,9 @@ class AssetFinder(object): if asset is not None: self._asset_cache[sid] = asset - if asset is not None: + if (asset is not None) or default_none: return asset - elif default_none: - return None - else: - raise SidNotFound(sid=sid) + raise SidNotFound(sid=sid) def retrieve_all(self, sids, default_none=False): return [self.retrieve_asset(sid, default_none) for sid in sids]