External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-22 03:17:39 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1115 from ryanpetrello/newer-dateutil

Browse Source 
remove an RRULE parsing bug fix that landed upstream in python-dateutil
This commit is contained in:
Matthew Jones
2018-03-26 20:36:10 -07:00
committed by GitHub
parent f3bf9bc34f 21d629531f
commit 3a3c883504
1 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
awx/main/models/schedules.py
View File

@@ -97,7 +97,7 @@ class Schedule(CommonModel, LaunchTimeConfig):
@classmethod @classmethod
def rrulestr(cls, rrule, **kwargs): 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 kwargs['forceset'] = True
x = dateutil.rrule.rrulestr(rrule, **kwargs) 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)' '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: if 'MINUTELY' in rrule or 'HOURLY' in rrule:
try: try:
first_event = x[0] first_event = x[0]