From b7cf84e4ecbf25932ff87cdcf31af3f374f20a9b Mon Sep 17 00:00:00 2001 From: dmichalowicz Date: Fri, 28 Aug 2015 13:27:22 -0400 Subject: [PATCH] Add SidNotFound exception case --- zipline/assets/assets.py | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/zipline/assets/assets.py b/zipline/assets/assets.py index 9cc52a1b..fd238426 100644 --- a/zipline/assets/assets.py +++ b/zipline/assets/assets.py @@ -529,33 +529,34 @@ class AssetFinder(object): On success, append to matches. On failure, append to missing. """ - try: - if isinstance(asset_convertible, Asset): - matches.append(asset_convertible) + if isinstance(asset_convertible, Asset): + matches.append(asset_convertible) - elif isinstance(asset_convertible, Integral): + elif isinstance(asset_convertible, Integral): + try: result = self.retrieve_asset(int(asset_convertible)) - if result is None: - raise SymbolNotFound(symbol=asset_convertible) - matches.append(result) + except SidNotFound: + missing.append(asset_convertible) + return None + matches.append(result) - elif isinstance(asset_convertible, string_types): - # Throws SymbolNotFound on failure to match. + elif isinstance(asset_convertible, string_types): + # Throws SymbolNotFound on failure to match. + try: matches.append( self.lookup_symbol_resolve_multiple( asset_convertible, as_of_date, ) ) - else: - raise NotAssetConvertible( - "Input was %s, not AssetConvertible." - % asset_convertible - ) - - except SymbolNotFound: - missing.append(asset_convertible) - return None + except SymbolNotFound: + missing.append(asset_convertible) + return None + else: + raise NotAssetConvertible( + "Input was %s, not AssetConvertible." + % asset_convertible + ) def lookup_generic(self, asset_convertible_or_iterable,