From 51e43e3d6108ccb72b6168a0bbc02026ee5c7e85 Mon Sep 17 00:00:00 2001 From: Scott Sanderson Date: Mon, 24 Nov 2014 10:58:42 -0500 Subject: [PATCH] BUG: Use string_types instead of basestring for py3 compat. --- zipline/algorithm.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/zipline/algorithm.py b/zipline/algorithm.py index 7797798c..b0843bbc 100644 --- a/zipline/algorithm.py +++ b/zipline/algorithm.py @@ -23,7 +23,11 @@ from datetime import datetime from itertools import groupby, chain from six.moves import filter -from six import iteritems, exec_ +from six import ( + exec_, + iteritems, + string_types, +) from operator import attrgetter from zipline.errors import ( @@ -784,7 +788,7 @@ class TradingAlgorithm(object): assert date_copy.tzinfo == pytz.utc, \ "Algorithm should have a utc datetime" if tz is not None: - if isinstance(tz, basestring): + if isinstance(tz, string_types): tz = pytz.timezone(tz) date_copy = date_copy.astimezone(tz) return date_copy