Barry Warsaw pushed to branch master at mailman / Mailman Core
Commits: e89d682b by Mark Sapiro at 2017-10-27T08:42:31-07:00 Avoid new flake8 3.5.0 E722, bare except:. - - - - - d8ec8de8 by Barry Warsaw at 2017-10-27T18:43:34+00:00 Merge branch 'flake8' into 'master' Add an ignore to flake8 in tox.ini. Closes #431 See merge request mailman/mailman!335 - - - - - 4 changed files: - src/mailman/app/workflow.py - src/mailman/core/logging.py - src/mailman/database/model.py - src/mailman/database/transaction.py Changes: ===================================== src/mailman/app/workflow.py ===================================== --- a/src/mailman/app/workflow.py +++ b/src/mailman/app/workflow.py @@ -69,7 +69,7 @@ class Workflow: return step() except IndexError: raise StopIteration - except: + except: # noqa: E722 log.exception('deque: {}'.format(COMMASPACE.join(self._next))) raise ===================================== src/mailman/core/logging.py ===================================== --- a/src/mailman/core/logging.py +++ b/src/mailman/core/logging.py @@ -70,7 +70,7 @@ class ReopenableFileHandler(logging.Handler): if msg[-1] != '\n': stream.write('\n') self.flush() - except: + except: # noqa: E722 pragma: nocover self.handleError(record) def close(self): ===================================== src/mailman/database/model.py ===================================== --- a/src/mailman/database/model.py +++ b/src/mailman/database/model.py @@ -39,7 +39,7 @@ class ModelMeta: # order. http://tinyurl.com/on8dy6f for table in reversed(Model.metadata.sorted_tables): connection.execute(table.delete()) - except: + except: # noqa: E722 pragma: nocover transaction.rollback() raise else: ===================================== src/mailman/database/transaction.py ===================================== --- a/src/mailman/database/transaction.py +++ b/src/mailman/database/transaction.py @@ -28,7 +28,7 @@ def transaction(): """Context manager for ensuring the transaction is complete.""" try: yield - except: + except: # noqa: E722 config.db.abort() raise else: @@ -50,7 +50,7 @@ def transactional(function): rtn = function(*args, **kws) config.db.commit() return rtn - except: + except: # noqa: E722 pragma: nocover config.db.abort() raise return wrapper View it on GitLab: https://gitlab.com/mailman/mailman/compare/500076718eb565845f3a0d107d584cd15c539406...d8ec8de8a2df0b729c46d9c1a9005c56e3999656 --- View it on GitLab: https://gitlab.com/mailman/mailman/compare/500076718eb565845f3a0d107d584cd15c539406...d8ec8de8a2df0b729c46d9c1a9005c56e3999656 You're receiving this email because of your account on gitlab.com.
_______________________________________________ Mailman-checkins mailing list Mailman-checkins@python.org Unsubscribe: https://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org