diff --git a/tests/calendars/test_trading_calendar.py b/tests/calendars/test_trading_calendar.py index 94af91da..1cbb0b3a 100644 --- a/tests/calendars/test_trading_calendar.py +++ b/tests/calendars/test_trading_calendar.py @@ -39,8 +39,12 @@ from zipline.utils.calendars import( deregister_calendar, get_calendar, ) -from zipline.utils.calendars.calendar_utils import register_calendar_type, \ - _default_calendar_factories +from zipline.utils.calendars.calendar_utils import ( + _default_calendar_aliases, + _default_calendar_factories, + register_calendar_type, + +) from zipline.utils.calendars.trading_calendar import days_at_time, \ TradingCalendar @@ -123,7 +127,8 @@ class CalendarRegistrationTestCase(TestCase): class DefaultsTestCase(TestCase): def test_default_calendars(self): - for name in concat(_default_calendar_factories): + for name in concat([_default_calendar_factories, + _default_calendar_aliases]): self.assertIsNotNone(get_calendar(name), "get_calendar(%r) returned None" % name) diff --git a/zipline/utils/calendars/calendar_utils.py b/zipline/utils/calendars/calendar_utils.py index 2d7df563..a3175799 100644 --- a/zipline/utils/calendars/calendar_utils.py +++ b/zipline/utils/calendars/calendar_utils.py @@ -25,7 +25,7 @@ _default_calendar_factories = { 'TSX': TSXExchangeCalendar, 'us_futures': QuantopianUSFuturesCalendar, } -_default_aliases = { +_default_calendar_aliases = { 'NASDAQ': 'NYSE', 'BATS': 'NYSE', 'CBOT': 'CME', @@ -254,7 +254,7 @@ class TradingCalendarDispatcher(object): global_calendar_dispatcher = TradingCalendarDispatcher( calendars={}, calendar_factories=_default_calendar_factories, - aliases=_default_aliases, + aliases=_default_calendar_aliases, ) get_calendar = global_calendar_dispatcher.get_calendar