diff options
author | kev <kev@flujos.org> | 2012-05-03 20:34:24 -0500 |
---|---|---|
committer | kev <kev@flujos.org> | 2012-05-03 20:34:24 -0500 |
commit | df57e1b291c94b07ce64bfb4cb0a07b7a446a6e3 (patch) | |
tree | 03473a5482ce166e79e052412188b4280f393907 | |
parent | ea46a70199897433b45f6e534793184b9439994e (diff) | |
download | croniter-df57e1b291c94b07ce64bfb4cb0a07b7a446a6e3.tar.gz |
fix python3 and python2.7 runtime errors
-rw-r--r-- | croniter/__init__.py | 4 | ||||
-rw-r--r-- | croniter/croniter.py | 14 | ||||
-rw-r--r-- | croniter/croniter_test.py | 2 | ||||
-rw-r--r-- | croniter/speed_test.py | 2 |
4 files changed, 13 insertions, 9 deletions
diff --git a/croniter/__init__.py b/croniter/__init__.py index e749a57..608bc5a 100644 --- a/croniter/__init__.py +++ b/croniter/__init__.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- # defer imports to be accesible in setup.py -from _release import ( +from ._release import ( __doc__, __author__, __version__, __license__, ) -from croniter import croniter +from .croniter import croniter diff --git a/croniter/croniter.py b/croniter/croniter.py index c1575a6..7453997 100644 --- a/croniter/croniter.py +++ b/croniter/croniter.py @@ -85,10 +85,14 @@ class croniter(object): if (not low or not high or int(low) > int(high) or not only_int_re.search(str(step))): raise ValueError("[%s] is not acceptable" %expr_format) - - for j in xrange(int(low), int(high)+1): - if j % int(step) == 0: - e_list.append(j) + try: + for j in xrange(int(low), int(high)+1): + if j % int(step) == 0: + e_list.append(j) + except NameError: + for j in range(int(low), int(high)+1): + if j % int(step) == 0: + e_list.append(j) else: if not star_or_int_re.search(t): t = self.ALPHACONV[i][t.lower()] @@ -267,7 +271,7 @@ class croniter(object): continue return mktime(dst.timetuple()) - raise "failed to find prev date" + raise Exception("failed to find prev date") def _get_next_nearest(self, x, to_check): small = [item for item in to_check if item < x] diff --git a/croniter/croniter_test.py b/croniter/croniter_test.py index 89d8581..5203696 100644 --- a/croniter/croniter_test.py +++ b/croniter/croniter_test.py @@ -3,7 +3,7 @@ import unittest from datetime import datetime -from croniter import croniter +from .croniter import croniter class CroniterTest(unittest.TestCase): def testSecond(self): diff --git a/croniter/speed_test.py b/croniter/speed_test.py index 362db47..02ea189 100644 --- a/croniter/speed_test.py +++ b/croniter/speed_test.py @@ -3,7 +3,7 @@ import time from datetime import datetime, date -from croniter import croniter +from .croniter import croniter class timerTest(object): def __init__(self): |