From a7cc6d2383a82ffbb980af95fdb67769c08adcff Mon Sep 17 00:00:00 2001 From: Ethan Dalool Date: Sat, 19 Sep 2020 03:08:45 -0700 Subject: [PATCH] Rename all caught exception variables to "exc", not "e". --- etiquette/searchhelpers.py | 4 ++-- frontends/etiquette_flask/backend/decorators.py | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/etiquette/searchhelpers.py b/etiquette/searchhelpers.py index 6c35c45..e1b79cc 100644 --- a/etiquette/searchhelpers.py +++ b/etiquette/searchhelpers.py @@ -143,9 +143,9 @@ def normalize_author(authors, photodb, warning_bag=None): try: user = photodb.get_user(username=requested_author) - except exceptions.NoSuchUser as e: + except exceptions.NoSuchUser as exc: if warning_bag: - warning_bag.add(e.error_message) + warning_bag.add(exc.error_message) else: raise else: diff --git a/frontends/etiquette_flask/backend/decorators.py b/frontends/etiquette_flask/backend/decorators.py index e82a9fc..53902fa 100644 --- a/frontends/etiquette_flask/backend/decorators.py +++ b/frontends/etiquette_flask/backend/decorators.py @@ -16,12 +16,12 @@ def catch_etiquette_exception(function): def wrapped(*args, **kwargs): try: return function(*args, **kwargs) - except etiquette.exceptions.EtiquetteException as e: - if isinstance(e, etiquette.exceptions.NoSuch): + except etiquette.exceptions.EtiquetteException as exc: + if isinstance(exc, etiquette.exceptions.NoSuch): status = 404 else: status = 400 - response = etiquette.jsonify.exception(e) + response = etiquette.jsonify.exception(exc) response = jsonify.make_json_response(response, status=status) flask.abort(response) return wrapped