diff options
author | Mathieu Le Marec - Pasquet <kiorky@cryptelium.net> | 2016-08-15 22:20:00 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-08-15 22:20:00 +0200 |
commit | 3827e2ab306a59104dd24aba45d169592d81f9be (patch) | |
tree | 18f41e6735d4dcf4a53bd6a32880f852f0980eb9 | |
parent | 635149373bb8661090bda9ee5c9325babe368755 (diff) | |
parent | 0ada22d6f0d4cf17e498596597ade0a8ae14d9a1 (diff) | |
download | croniter-3827e2ab306a59104dd24aba45d169592d81f9be.tar.gz |
Merge pull request #14 from kiorky/revert-13-master
Revert "merge from taichino"
-rw-r--r-- | src/croniter/croniter.py | 13 | ||||
-rwxr-xr-x | src/croniter/tests/test_croniter.py | 6 |
2 files changed, 5 insertions, 14 deletions
diff --git a/src/croniter/croniter.py b/src/croniter/croniter.py index 25bb42d..5cc2f41 100644 --- a/src/croniter/croniter.py +++ b/src/croniter/croniter.py @@ -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)) + low = "{0}".format(self.ALPHACONV[i][low.lower()]) if not any_int_re.search(high): - high = "{0}".format(self._alphaconv(i, high)) + high = "{0}".format(self.ALPHACONV[i][high.lower()]) 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) + t = self.ALPHACONV[i][t.lower()] try: t = int(t) @@ -138,13 +138,6 @@ 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) diff --git a/src/croniter/tests/test_croniter.py b/src/croniter/tests/test_croniter.py index 0601a7f..55b81a2 100755 --- a/src/croniter/tests/test_croniter.py +++ b/src/croniter/tests/test_croniter.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python # -*- coding: utf-8 -*- import unittest @@ -228,9 +228,7 @@ class CroniterTest(base.TestCase): self.assertRaises(TypeError, itr.get_next, str) self.assertRaises(ValueError, croniter, '* * * *') self.assertRaises(ValueError, croniter, '* * 5-1 * *') - self.assertRaises(ValueError, croniter, '-90 * * * *') - self.assertRaises(ValueError, croniter, 'a * * * *') - self.assertRaises(ValueError, croniter, '* * * janu-jun *') + self.assertRaises(KeyError, croniter, '* * * janu-jun *') def testSundayToThursdayWithAlphaConversion(self): base = datetime(2010, 8, 25, 15, 56) #wednesday |