Merge pull request #15 from kiorky/revert-14-revert-13-master
Revert "Revert "merge from taichino""
This commit is contained in:
commit
afa938fff4
|
@ -86,10 +86,10 @@ class croniter(object):
|
||||||
(low, high, step) = m.group(1), m.group(2), m.group(4) or 1
|
(low, high, step) = m.group(1), m.group(2), m.group(4) or 1
|
||||||
|
|
||||||
if not any_int_re.search(low):
|
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):
|
if not any_int_re.search(high):
|
||||||
high = "{0}".format(self.ALPHACONV[i][high.lower()])
|
high = "{0}".format(self._alphaconv(i, high))
|
||||||
|
|
||||||
if (
|
if (
|
||||||
not low or not high or int(low) > int(high)
|
not low or not high or int(low) > int(high)
|
||||||
|
@ -111,7 +111,7 @@ class croniter(object):
|
||||||
# e_list.append(j)
|
# e_list.append(j)
|
||||||
else:
|
else:
|
||||||
if not star_or_int_re.search(t):
|
if not star_or_int_re.search(t):
|
||||||
t = self.ALPHACONV[i][t.lower()]
|
t = self._alphaconv(i, t)
|
||||||
|
|
||||||
try:
|
try:
|
||||||
t = int(t)
|
t = int(t)
|
||||||
|
@ -138,6 +138,13 @@ class croniter(object):
|
||||||
else res)
|
else res)
|
||||||
self.expanded = expanded
|
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):
|
def get_next(self, ret_type=None):
|
||||||
return self._get_next(ret_type or self._ret_type, is_prev=False)
|
return self._get_next(ret_type or self._ret_type, is_prev=False)
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
#!/usr/bin/python
|
#!/usr/bin/env python
|
||||||
# -*- coding: utf-8 -*-
|
# -*- coding: utf-8 -*-
|
||||||
|
|
||||||
import unittest
|
import unittest
|
||||||
|
@ -228,7 +228,9 @@ class CroniterTest(base.TestCase):
|
||||||
self.assertRaises(TypeError, itr.get_next, str)
|
self.assertRaises(TypeError, itr.get_next, str)
|
||||||
self.assertRaises(ValueError, croniter, '* * * *')
|
self.assertRaises(ValueError, croniter, '* * * *')
|
||||||
self.assertRaises(ValueError, croniter, '* * 5-1 * *')
|
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):
|
def testSundayToThursdayWithAlphaConversion(self):
|
||||||
base = datetime(2010, 8, 25, 15, 56) #wednesday
|
base = datetime(2010, 8, 25, 15, 56) #wednesday
|
||||||
|
|
Loading…
Reference in New Issue