From 21d629531fab88fa912dc1eff979ea9af590a495 Mon Sep 17 00:00:00 2001 From: Ryan Petrello Date: Mon, 26 Mar 2018 17:21:59 -0400 Subject: [PATCH] remove an RRULE parsing bug fix that landed upstream in python-dateutil related: a2a246a834ab34d36e53b38b34e8363f5c6b4167 --- awx/main/models/schedules.py | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/awx/main/models/schedules.py b/awx/main/models/schedules.py index 8736647a65..71efa702c6 100644 --- a/awx/main/models/schedules.py +++ b/awx/main/models/schedules.py @@ -97,7 +97,7 @@ class Schedule(CommonModel, LaunchTimeConfig): @classmethod def rrulestr(cls, rrule, **kwargs): """ - Apply our own custom rrule parsing logic to support TZID= + Apply our own custom rrule parsing requirements """ kwargs['forceset'] = True x = dateutil.rrule.rrulestr(rrule, **kwargs) @@ -108,15 +108,6 @@ class Schedule(CommonModel, LaunchTimeConfig): 'A valid TZID must be provided (e.g., America/New_York)' ) - if r._dtstart and r._until: - # If https://github.com/dateutil/dateutil/pull/634 ever makes - # it into a python-dateutil release, we could remove this block. - if all(( - r._dtstart.tzinfo != dateutil.tz.tzlocal(), - r._until.tzinfo != dateutil.tz.tzutc(), - )): - raise ValueError('RRULE UNTIL values must be specified in UTC') - if 'MINUTELY' in rrule or 'HOURLY' in rrule: try: first_event = x[0]