From 89793e371c3cb012a7d03cdf96e3d171ffef5b9a Mon Sep 17 00:00:00 2001 From: Eddie Hebert Date: Mon, 11 Nov 2013 14:17:14 -0500 Subject: [PATCH] MAINT: Protect loader against Series saved with no tz. Checking for tz.UTC is not sufficient, since it is possible for the index.tz value to be None. --- zipline/data/loader.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/zipline/data/loader.py b/zipline/data/loader.py index a6ce5b7c..9b0e2206 100644 --- a/zipline/data/loader.py +++ b/zipline/data/loader.py @@ -162,11 +162,19 @@ Fetching data from Yahoo Finance. # we have data,then we need to update if len(trading_days) - last_bm_date_offset > 1: benchmark_returns = update_benchmarks(bm_symbol, last_bm_date) - if benchmark_returns.index.tz.zone != 'UTC': + if ( + benchmark_returns.index.tz is None + or + benchmark_returns.index.zone != 'UTC' + ): benchmark_returns = benchmark_returns.tz_localize('UTC') else: benchmark_returns = saved_benchmarks - if benchmark_returns.index.tz.zone != 'UTC': + if ( + benchmark_returns.index.tz is None + or + benchmark_returns.index.zone != 'UTC' + ): benchmark_returns = benchmark_returns.tz_localize('UTC') try: