From 0f66d24dd41582c88bd856ca2ea2f02a545c977a Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Sun, 31 Aug 2025 21:55:39 -0500 Subject: [PATCH] fix: fix 'bare-except' and 'broad-exception-caught' for pylint --- .pylintrc | 2 -- src/wuttaweb/forms/schema.py | 2 +- src/wuttaweb/grids/base.py | 2 +- src/wuttaweb/grids/filters.py | 2 +- src/wuttaweb/views/batch.py | 4 ++-- src/wuttaweb/views/common.py | 4 ++-- src/wuttaweb/views/master.py | 4 ++-- 7 files changed, 9 insertions(+), 11 deletions(-) diff --git a/.pylintrc b/.pylintrc index 2186f77..98a3ee6 100644 --- a/.pylintrc +++ b/.pylintrc @@ -7,8 +7,6 @@ disable=fixme, arguments-renamed, assignment-from-no-return, attribute-defined-outside-init, - bare-except, - broad-exception-caught, consider-using-dict-comprehension, consider-using-dict-items, consider-using-generator, diff --git a/src/wuttaweb/forms/schema.py b/src/wuttaweb/forms/schema.py index 222eb3a..f3384b1 100644 --- a/src/wuttaweb/forms/schema.py +++ b/src/wuttaweb/forms/schema.py @@ -63,7 +63,7 @@ class WuttaDateTime(colander.DateTime): for fmt in formats: try: return datetime.datetime.strptime(cstruct, fmt) - except: + except Exception: # pylint: disable=broad-exception-caught pass node.raise_invalid("Invalid date and/or time") diff --git a/src/wuttaweb/grids/base.py b/src/wuttaweb/grids/base.py index f21aacc..414844d 100644 --- a/src/wuttaweb/grids/base.py +++ b/src/wuttaweb/grids/base.py @@ -1853,7 +1853,7 @@ class Grid: # pylint: disable=too-many-instance-attributes data = filtr.apply_filter(data) except VerbNotSupported as error: log.warning("verb not supported for '%s' filter: %s", key, error.verb) - except: + except Exception: # pylint: disable=broad-exception-caught log.exception("filtering data by '%s' failed!", key) return data diff --git a/src/wuttaweb/grids/filters.py b/src/wuttaweb/grids/filters.py index ea105eb..4c66c5c 100644 --- a/src/wuttaweb/grids/filters.py +++ b/src/wuttaweb/grids/filters.py @@ -582,7 +582,7 @@ class IntegerAlchemyFilter(NumericAlchemyFilter): if value: try: return int(value) - except: + except Exception: # pylint: disable=broad-exception-caught pass return None diff --git a/src/wuttaweb/views/batch.py b/src/wuttaweb/views/batch.py index 2064859..77cc056 100644 --- a/src/wuttaweb/views/batch.py +++ b/src/wuttaweb/views/batch.py @@ -329,7 +329,7 @@ class BatchMasterView(MasterView): self.batch_handler.do_populate(batch, progress=progress) session.flush() - except Exception as error: + except Exception as error: # pylint: disable=broad-exception-caught session.rollback() log.warning( "failed to populate %s: %s", @@ -367,7 +367,7 @@ class BatchMasterView(MasterView): try: self.batch_handler.do_execute(batch, self.request.user) - except Exception as error: + except Exception as error: # pylint: disable=broad-exception-caught log.warning("failed to execute batch: %s", batch, exc_info=True) self.request.session.flash(f"Execution failed!: {error}", "error") diff --git a/src/wuttaweb/views/common.py b/src/wuttaweb/views/common.py index 3980246..71ef57e 100644 --- a/src/wuttaweb/views/common.py +++ b/src/wuttaweb/views/common.py @@ -109,7 +109,7 @@ class CommonView(View): # send email try: self.feedback_send(context) - except Exception as error: + except Exception as error: # pylint: disable=broad-exception-caught log.warning("failed to send feedback email", exc_info=True) return {"error": str(error) or error.__class__.__name__} @@ -287,7 +287,7 @@ class CommonView(View): if theme: try: set_app_theme(self.request, theme, session=Session()) - except Exception as error: + except Exception as error: # pylint: disable=broad-exception-caught error = self.app.render_error(error) self.request.session.flash(f"Failed to set theme: {error}", "error") referrer = self.request.params.get("referrer") or self.request.get_referrer() diff --git a/src/wuttaweb/views/master.py b/src/wuttaweb/views/master.py index f5f9e82..c0d535f 100644 --- a/src/wuttaweb/views/master.py +++ b/src/wuttaweb/views/master.py @@ -826,7 +826,7 @@ class MasterView(View): try: self.delete_bulk_action(records, progress=progress) - except Exception as error: + except Exception as error: # pylint: disable=broad-exception-caught session.rollback() log.warning( "failed to delete %s results for %s", @@ -1128,7 +1128,7 @@ class MasterView(View): try: self.execute_instance(obj, user, progress=progress) - except Exception as error: + except Exception as error: # pylint: disable=broad-exception-caught session.rollback() log.warning("%s failed to execute: %s", model_title, obj, exc_info=True) if progress: