openstack
/
deb-python-croniter
Code Issues Proposed changes

Merge pull request #65 from int3rlop3r/master 

Better handling of invalid expressions
This commit is contained in:
Mathieu Le Marec - Pasquet 2016-08-15 22:17:53 +02:00 committed by GitHub
parent 102700d569 8bc6346434
commit 0e08b40d95
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/croniter/croniter.py
View File

@ -86,10 +86,10 @@ class croniter(object):
(low, high, step) = m.group(1), m.group(2), m.group(4) or 1
if not any_int_re.search(low):
low = "{0}".format(self.ALPHACONV[i][low.lower()])
low = "{0}".format(self._alphaconv(i, low))
if not any_int_re.search(high):
high = "{0}".format(self.ALPHACONV[i][high.lower()])
high = "{0}".format(self._alphaconv(i, high))
if (
not low or not high or int(low) > int(high)
@ -111,7 +111,7 @@ class croniter(object):
# e_list.append(j)
else:
if not star_or_int_re.search(t):
t = self.ALPHACONV[i][t.lower()]
t = self._alphaconv(i, t)
try:
t = int(t)
@ -138,6 +138,13 @@ class croniter(object):
else res)
self.expanded = expanded
def _alphaconv(self, index, key):
try:
return self.ALPHACONV[index][key.lower()]
except KeyError:
raise ValueError(
"[{0}] is not acceptable".format(" ".join(self.exprs)))
def get_next(self, ret_type=None):
return self._get_next(ret_type or self._ret_type, is_prev=False)

4
src/croniter/tests/test_croniter.py
View File

@ -228,7 +228,9 @@ class CroniterTest(base.TestCase):
self.assertRaises(TypeError, itr.get_next, str)
self.assertRaises(ValueError, croniter, '* * * *')
self.assertRaises(ValueError, croniter, '* * 5-1 * *')
self.assertRaises(KeyError, croniter, '* * * janu-jun *')
self.assertRaises(ValueError, croniter, '-90 * * * *')
self.assertRaises(ValueError, croniter, 'a * * * *')
self.assertRaises(ValueError, croniter, '* * * janu-jun *')
def testSundayToThursdayWithAlphaConversion(self):
base = datetime(2010, 8, 25, 15, 56) #wednesday