diff options
author | Alex Grönholm <alex.gronholm@nextday.fi> | 2017-11-07 02:09:56 +0200 |
---|---|---|
committer | Alex Grönholm <alex.gronholm@nextday.fi> | 2017-11-07 02:09:56 +0200 |
commit | cbf2eeb21695343c1996e59732adbc8fbbab6842 (patch) | |
tree | 72324d7cd0bb998c7bf79a053f83f1db4332f5bc | |
parent | a3ca76945f2538f0e3bfaacf8996ac570f35961c (diff) | |
download | apscheduler-cbf2eeb21695343c1996e59732adbc8fbbab6842.tar.gz |
Fixed flake8's "Don't use bare except:" errors
-rw-r--r-- | apscheduler/executors/asyncio.py | 2 | ||||
-rw-r--r-- | apscheduler/executors/base.py | 2 | ||||
-rw-r--r-- | apscheduler/executors/base_py3.py | 2 | ||||
-rw-r--r-- | apscheduler/executors/debug.py | 2 | ||||
-rw-r--r-- | apscheduler/executors/gevent.py | 2 | ||||
-rw-r--r-- | apscheduler/executors/tornado.py | 2 | ||||
-rw-r--r-- | apscheduler/jobstores/mongodb.py | 2 | ||||
-rw-r--r-- | apscheduler/jobstores/redis.py | 2 | ||||
-rw-r--r-- | apscheduler/jobstores/sqlalchemy.py | 2 | ||||
-rw-r--r-- | apscheduler/jobstores/zookeeper.py | 4 | ||||
-rw-r--r-- | apscheduler/schedulers/base.py | 6 |
11 files changed, 14 insertions, 14 deletions
diff --git a/apscheduler/executors/asyncio.py b/apscheduler/executors/asyncio.py index 4479429..dd16ee7 100644 --- a/apscheduler/executors/asyncio.py +++ b/apscheduler/executors/asyncio.py @@ -31,7 +31,7 @@ class AsyncIOExecutor(BaseExecutor): def callback(f): try: events = f.result() - except: + except BaseException: self._run_job_error(job.id, *sys.exc_info()[1:]) else: self._run_job_success(job.id, events) diff --git a/apscheduler/executors/base.py b/apscheduler/executors/base.py index b36a86f..a42768e 100644 --- a/apscheduler/executors/base.py +++ b/apscheduler/executors/base.py @@ -123,7 +123,7 @@ def run_job(job, jobstore_alias, run_times, logger_name): logger.info('Running job "%s" (scheduled at %s)', job, run_time) try: retval = job.func(*job.args, **job.kwargs) - except: + except BaseException: exc, tb = sys.exc_info()[1:] formatted_tb = ''.join(format_tb(tb)) events.append(JobExecutionEvent(EVENT_JOB_ERROR, job.id, jobstore_alias, run_time, diff --git a/apscheduler/executors/base_py3.py b/apscheduler/executors/base_py3.py index 4712425..61abd84 100644 --- a/apscheduler/executors/base_py3.py +++ b/apscheduler/executors/base_py3.py @@ -27,7 +27,7 @@ async def run_coroutine_job(job, jobstore_alias, run_times, logger_name): logger.info('Running job "%s" (scheduled at %s)', job, run_time) try: retval = await job.func(*job.args, **job.kwargs) - except: + except BaseException: exc, tb = sys.exc_info()[1:] formatted_tb = ''.join(format_tb(tb)) events.append(JobExecutionEvent(EVENT_JOB_ERROR, job.id, jobstore_alias, run_time, diff --git a/apscheduler/executors/debug.py b/apscheduler/executors/debug.py index f6454d5..ac739ae 100644 --- a/apscheduler/executors/debug.py +++ b/apscheduler/executors/debug.py @@ -14,7 +14,7 @@ class DebugExecutor(BaseExecutor): def _do_submit_job(self, job, run_times): try: events = run_job(job, job._jobstore_alias, run_times, self._logger.name) - except: + except BaseException: self._run_job_error(job.id, *sys.exc_info()[1:]) else: self._run_job_success(job.id, events) diff --git a/apscheduler/executors/gevent.py b/apscheduler/executors/gevent.py index a12b806..1235bb6 100644 --- a/apscheduler/executors/gevent.py +++ b/apscheduler/executors/gevent.py @@ -21,7 +21,7 @@ class GeventExecutor(BaseExecutor): def callback(greenlet): try: events = greenlet.get() - except: + except BaseException: self._run_job_error(job.id, *sys.exc_info()[1:]) else: self._run_job_success(job.id, events) diff --git a/apscheduler/executors/tornado.py b/apscheduler/executors/tornado.py index 6519c3e..a4696ce 100644 --- a/apscheduler/executors/tornado.py +++ b/apscheduler/executors/tornado.py @@ -39,7 +39,7 @@ class TornadoExecutor(BaseExecutor): def callback(f): try: events = f.result() - except: + except BaseException: self._run_job_error(job.id, *sys.exc_info()[1:]) else: self._run_job_success(job.id, events) diff --git a/apscheduler/jobstores/mongodb.py b/apscheduler/jobstores/mongodb.py index fc88325..7dbc3b1 100644 --- a/apscheduler/jobstores/mongodb.py +++ b/apscheduler/jobstores/mongodb.py @@ -126,7 +126,7 @@ class MongoDBJobStore(BaseJobStore): sort=[('next_run_time', ASCENDING)]): try: jobs.append(self._reconstitute_job(document['job_state'])) - except: + except BaseException: self._logger.exception('Unable to restore job "%s" -- removing it', document['_id']) failed_job_ids.append(document['_id']) diff --git a/apscheduler/jobstores/redis.py b/apscheduler/jobstores/redis.py index 4e092f7..61f913e 100644 --- a/apscheduler/jobstores/redis.py +++ b/apscheduler/jobstores/redis.py @@ -129,7 +129,7 @@ class RedisJobStore(BaseJobStore): for job_id, job_state in job_states: try: jobs.append(self._reconstitute_job(job_state)) - except: + except BaseException: self._logger.exception('Unable to restore job "%s" -- removing it', job_id) failed_job_ids.append(job_id) diff --git a/apscheduler/jobstores/sqlalchemy.py b/apscheduler/jobstores/sqlalchemy.py index af0c96b..beb27fb 100644 --- a/apscheduler/jobstores/sqlalchemy.py +++ b/apscheduler/jobstores/sqlalchemy.py @@ -139,7 +139,7 @@ class SQLAlchemyJobStore(BaseJobStore): for row in self.engine.execute(selectable): try: jobs.append(self._reconstitute_job(row.job_state)) - except: + except BaseException: self._logger.exception('Unable to restore job "%s" -- removing it', row.id) failed_job_ids.add(row.id) diff --git a/apscheduler/jobstores/zookeeper.py b/apscheduler/jobstores/zookeeper.py index 44e2e61..2cca83e 100644 --- a/apscheduler/jobstores/zookeeper.py +++ b/apscheduler/jobstores/zookeeper.py @@ -71,7 +71,7 @@ class ZooKeeperJobStore(BaseJobStore): doc = pickle.loads(content) job = self._reconstitute_job(doc['job_state']) return job - except: + except BaseException: return None def get_due_jobs(self, now): @@ -162,7 +162,7 @@ class ZooKeeperJobStore(BaseJobStore): 'creation_time': _.ctime } jobs.append(job_def) - except: + except BaseException: self._logger.exception('Unable to restore job "%s" -- removing it' % node_name) failed_job_ids.append(node_name) diff --git a/apscheduler/schedulers/base.py b/apscheduler/schedulers/base.py index 9326909..ab705c3 100644 --- a/apscheduler/schedulers/base.py +++ b/apscheduler/schedulers/base.py @@ -821,7 +821,7 @@ class BaseScheduler(six.with_metaclass(ABCMeta)): if event.code & mask: try: cb(event) - except: + except BaseException: self._logger.exception('Error notifying listener') def _real_add_job(self, job, jobstore_alias, replace_existing): @@ -944,7 +944,7 @@ class BaseScheduler(six.with_metaclass(ABCMeta)): # Look up the job's executor try: executor = self._lookup_executor(job.executor) - except: + except BaseException: self._logger.error( 'Executor lookup ("%s") failed for job "%s" -- removing it from the ' 'job store', job.executor, job) @@ -963,7 +963,7 @@ class BaseScheduler(six.with_metaclass(ABCMeta)): event = JobSubmissionEvent(EVENT_JOB_MAX_INSTANCES, job.id, jobstore_alias, run_times) events.append(event) - except: + except BaseException: self._logger.exception('Error submitting job "%s" to executor "%s"', job, job.executor) else: |