From 5490349c62b2bb0577f78ac34b17a38369192663 Mon Sep 17 00:00:00 2001 From: Thomas Wiecki Date: Wed, 17 Sep 2014 18:17:11 +0200 Subject: [PATCH] MAINT: Test frequency.unit_str instead of frequency string. --- zipline/history/history.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/zipline/history/history.py b/zipline/history/history.py index 846a82d4..87982219 100644 --- a/zipline/history/history.py +++ b/zipline/history/history.py @@ -243,13 +243,14 @@ class HistorySpec(object): def __init__(self, bar_count, frequency, field, ffill, daily_at_midnight=False, data_frequency='daily'): - if frequency == '1m' and data_frequency == 'daily': - raise ValueError('Minute history requires minute frequency input data.\ -Either use daily history or provide minute frequency data.') # Number of bars to look back. self.bar_count = bar_count if isinstance(frequency, str): frequency = Frequency(frequency, daily_at_midnight) + if frequency.unit_str == 'm' and data_frequency == 'daily': + raise ValueError('Minute history requires minute frequency input data.\ +Either use daily history or provide minute frequency data.') + # The frequency at which the data is sampled. self.frequency = frequency # The field, e.g. 'price', 'volume', etc.