From 16ab46b69c888a844481c08fa865a10923489c54 Mon Sep 17 00:00:00 2001 From: jfkirk Date: Tue, 21 Jul 2015 16:06:52 -0400 Subject: [PATCH] DEV: Uses ValueError when PerformanceTracker.to_dict receives invalid emission type --- zipline/finance/performance/tracker.py | 2 +- zipline/gens/tradesimulation.py | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/zipline/finance/performance/tracker.py b/zipline/finance/performance/tracker.py index 1afa1888..f459605f 100644 --- a/zipline/finance/performance/tracker.py +++ b/zipline/finance/performance/tracker.py @@ -298,7 +298,7 @@ class PerformanceTracker(object): _dict['minute_perf'] = self.todays_performance.to_dict( self.saved_dt) else: - raise BaseException("Invalid emission type: %s" % emission_type) + raise ValueError("Invalid emission type: %s" % emission_type) return _dict diff --git a/zipline/gens/tradesimulation.py b/zipline/gens/tradesimulation.py index b3d47b13..af9117d2 100644 --- a/zipline/gens/tradesimulation.py +++ b/zipline/gens/tradesimulation.py @@ -121,9 +121,8 @@ class AlgorithmSimulator(object): ) # Perf messages are only emitted if the snapshot contained # a benchmark event. - if messages is not None: - for message in messages: - yield message + for message in messages: + yield message # When emitting minutely, we need to call # before_trading_start before the next trading day begins @@ -315,7 +314,7 @@ class AlgorithmSimulator(object): if benchmark_event_occurred: return self.generate_messages(dt) else: - return None + return () def _call_handle_data(self): """