kumi/parse_crontab
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #1 from grahambell/master

Browse source 
Minor patches to parse-crontab
This commit is contained in:
Josiah Carlson 2012-08-12 23:42:25 -07:00
commit 696e7ab872
1 changed files with 24 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
crontab/_crontab.py
View file

@ -12,6 +12,7 @@ Other licenses may be available upon request.
from collections import namedtuple from collections import namedtuple
import datetime import datetime
import sys
_ranges = [ _ranges = [
(0, 59), (0, 59),
@ -43,6 +44,12 @@ _aliases = {
'@hourly': '0 * * * *', '@hourly': '0 * * * *',
} }
if sys.version_info >= (3, 0):
_number_types = (int, float)
xrange = range
else:
_number_types = (int, long, float)
MINUTE = datetime.timedelta(minutes=1) MINUTE = datetime.timedelta(minutes=1)
HOUR = datetime.timedelta(hours=1) HOUR = datetime.timedelta(hours=1)
DAY = datetime.timedelta(days=1) DAY = datetime.timedelta(days=1)
@ -188,15 +195,18 @@ class _Matcher(object):
end = _end end = _end
if increment is None: if increment is None:
return set([start]) return set([start])
_assert(_start <= start <= _end, _assert(_start <= start <= _end_limit,
"range start value %r out of range [%r, %r]", start, _start, _end) "range start value %r out of range [%r, %r]",
_assert(_start <= end <= _end, start, _start, _end_limit)
"range end value %r out of range [%r, %r]", end, _start, _end) _assert(_start <= end <= _end_limit,
"range end value %r out of range [%r, %r]",
end, _start, _end_limit)
_assert(start <= end, _assert(start <= end,
"range start value %r > end value %r", start, end) "range start value %r > end value %r", start, end)
return set(range(start, end+1, increment or 1)) return set(range(start, end+1, increment or 1))
_start, _end = _ranges[which] _start, _end = _ranges[which]
_end_limit = _end
# wildcards # wildcards
if entry in ('*', '?'): if entry in ('*', '?'):
if entry == '?': if entry == '?':
@ -225,11 +235,20 @@ class _Matcher(object):
"you can only use positive increment values, you provided %r", "you can only use positive increment values, you provided %r",
increment) increment)
# allow Sunday to be specified as weekday 7
if which == 4:
_end_limit = 7
# handle all of the a,b,c and x-y,a,b entries # handle all of the a,b,c and x-y,a,b entries
good = set() good = set()
for it in entry.split(','): for it in entry.split(','):
good.update(_parse_piece(it)) good.update(_parse_piece(it))
# change Sunday to weekday 0
if which == 4 and 7 in good:
good.discard(7)
good.add(0)
return good, _end return good, _end
class CronTab(object): class CronTab(object):
@ -274,7 +293,7 @@ class CronTab(object):
executed. executed.
''' '''
now = now or datetime.datetime.now() now = now or datetime.datetime.now()
if isinstance(now, (int, long, float)): if isinstance(now, _number_types):
now = datetime.datetime.fromtimestamp(now) now = datetime.datetime.fromtimestamp(now)
# get a reasonable future/past start time # get a reasonable future/past start time
future = now.replace(second=0, microsecond=0) + increments[0]() future = now.replace(second=0, microsecond=0) + increments[0]()