diff options
| author | agronholm <devnull@localhost> | 2011-01-22 23:41:12 +0200 |
|---|---|---|
| committer | agronholm <devnull@localhost> | 2011-01-22 23:41:12 +0200 |
| commit | f4b8f8dd6d242b829ab5279e0d4aec9d8a60271c (patch) | |
| tree | 98aaa15af6fee6cf6acc9d83019b00881bf0b478 | |
| parent | f2b93a0e0a8ff8f77f8ee04a962d0121d64c424c (diff) | |
| download | apscheduler-f4b8f8dd6d242b829ab5279e0d4aec9d8a60271c.tar.gz | |
Unified dict iteration in py2.x/3.x
| -rw-r--r-- | apscheduler/scheduler.py | 8 | ||||
| -rw-r--r-- | apscheduler/util.py | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/apscheduler/scheduler.py b/apscheduler/scheduler.py index fe6e84c..48bda73 100644 --- a/apscheduler/scheduler.py +++ b/apscheduler/scheduler.py @@ -337,7 +337,7 @@ class Scheduler(object): Returns a list of all scheduled jobs. """ jobs = [] - for jobstore in self._jobstores.values(): + for jobstore in dict_values(self._jobstores): jobs.extend(jobstore.jobs) return jobs @@ -345,7 +345,7 @@ class Scheduler(object): """ Removes a job, preventing it from being run any more. """ - for jobstore in self._jobstores.values(): + for jobstore in dict_values(self._jobstores): if job in jobstore.jobs: jobstore.remove_job(job) logger.info('Removed job "%s"', job) @@ -361,7 +361,7 @@ class Scheduler(object): :param out: a file-like object to print to. """ job_strs = [] - for alias, jobstore in self._jobstores.items(): + for alias, jobstore in dict_items(self._jobstores): job_strs.append('Jobstore %s:' % alias) if jobstore.jobs: for job in jobstore.jobs: @@ -421,7 +421,7 @@ class Scheduler(object): logger.debug('Looking for jobs to run') now = datetime.now() next_wakeup_time = None - for jobstore in self._jobstores.values(): + for jobstore in dict_values(self._jobstores): for job in tuple(jobstore.jobs): run_time = job.next_run_time if run_time <= now: diff --git a/apscheduler/util.py b/apscheduler/util.py index 85e43e0..8fed9cd 100644 --- a/apscheduler/util.py +++ b/apscheduler/util.py @@ -10,7 +10,7 @@ import sys __all__ = ('asint', 'asbool', 'convert_to_datetime', 'timedelta_seconds', 'time_difference', 'datetime_ceil', 'combine_opts', 'get_callable_name', 'obj_to_ref', 'ref_to_obj', 'maybe_ref', - 'to_unicode', 'dict_values') + 'to_unicode', 'dict_keys', 'dict_values', 'dict_items') def asint(text): |