From 4703f91820f519763290d752f7f182e543ca0b6d Mon Sep 17 00:00:00 2001 From: "Dustin J. Mitchell" Date: Mon, 12 Mar 2012 16:08:59 -0700 Subject: [PATCH 1/4] remove unused import --- croniter/croniter.py | 2 +- croniter/croniter_test.py | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/croniter/croniter.py b/croniter/croniter.py index 8207794..e5ecb89 100644 --- a/croniter/croniter.py +++ b/croniter/croniter.py @@ -3,7 +3,7 @@ import re from time import time, mktime -from datetime import datetime, date +from datetime import datetime from dateutil.relativedelta import relativedelta search_re = re.compile(r'^([^-]+)-([^-/]+)(/(.*))?$') diff --git a/croniter/croniter_test.py b/croniter/croniter_test.py index ad8e98a..620c78a 100644 --- a/croniter/croniter_test.py +++ b/croniter/croniter_test.py @@ -2,8 +2,7 @@ # -*- coding: utf-8 -*- import unittest -import time -from datetime import datetime, date +from datetime import datetime from croniter import croniter class CroniterTest(unittest.TestCase): From aa89db2d82471d683b6167bdbeb41514bff8ff77 Mon Sep 17 00:00:00 2001 From: "Dustin J. Mitchell" Date: Mon, 12 Mar 2012 16:29:24 -0700 Subject: [PATCH 2/4] eliminate duplicate test name --- croniter/croniter_test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/croniter/croniter_test.py b/croniter/croniter_test.py index 620c78a..105174a 100644 --- a/croniter/croniter_test.py +++ b/croniter/croniter_test.py @@ -178,7 +178,7 @@ class CroniterTest(unittest.TestCase): self.assertEqual(prev3.hour, 0) self.assertEqual(prev3.minute, 0) - def testPrevWeekDay(self): + def testPrevWeekDay2(self): base = datetime(2010, 8, 25, 15, 56) itr = croniter('10 0 * * 0', base) prev = itr.get_prev(datetime) From aa5766d5af310e177699b5a6a87b7aaa1201e28f Mon Sep 17 00:00:00 2001 From: "Dustin J. Mitchell" Date: Mon, 12 Mar 2012 16:09:17 -0700 Subject: [PATCH 3/4] remove unused variables --- croniter/croniter.py | 2 -- croniter/croniter_test.py | 1 - 2 files changed, 3 deletions(-) diff --git a/croniter/croniter.py b/croniter/croniter.py index e5ecb89..95a101c 100644 --- a/croniter/croniter.py +++ b/croniter/croniter.py @@ -145,11 +145,9 @@ class croniter(object): def _calc(self, now, expanded, is_prev): if is_prev: - nearest_method = self._get_prev_nearest nearest_diff_method = self._get_prev_nearest_diff sign = -1 else: - nearest_method = self._get_next_nearest nearest_diff_method = self._get_next_nearest_diff sign = 1 diff --git a/croniter/croniter_test.py b/croniter/croniter_test.py index 105174a..5e09de7 100644 --- a/croniter/croniter_test.py +++ b/croniter/croniter_test.py @@ -119,7 +119,6 @@ class CroniterTest(unittest.TestCase): self.assertEqual(n4.year, 2011) def testError(self): - base = datetime(2010, 1, 25) itr = croniter('* * * * *') self.assertRaises(TypeError, itr.get_next, str) self.assertRaises(ValueError, croniter, '* * * *') From 6469f28a7d3822efe85f1b5dc55f267d810423bb Mon Sep 17 00:00:00 2001 From: "Dustin J. Mitchell" Date: Mon, 12 Mar 2012 16:09:54 -0700 Subject: [PATCH 4/4] update the correct variable (not a shadowed variable from the parent function) --- croniter/croniter.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/croniter/croniter.py b/croniter/croniter.py index 95a101c..087850a 100644 --- a/croniter/croniter.py +++ b/croniter/croniter.py @@ -230,7 +230,7 @@ class croniter(object): if expanded[5][0] != '*': diff_sec = nearest_diff_method(d.second, expanded[5], 60) if diff_sec != None and diff_sec != 0: - dst += relativedelta(seconds = diff_sec) + d += relativedelta(seconds = diff_sec) return True, d else: d += relativedelta(second = 0)