From 56fe105cfc70bc1ae9815f725fdce1eac9582240 Mon Sep 17 00:00:00 2001 From: Hanne Moa Date: Mon, 17 Jun 2024 12:44:56 +0200 Subject: [PATCH 1/6] Move "not" next to "in" --- src/howitz/config/zino1.py | 2 +- src/howitz/error_handlers.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/howitz/config/zino1.py b/src/howitz/config/zino1.py index 6ceaf8c..d636263 100644 --- a/src/howitz/config/zino1.py +++ b/src/howitz/config/zino1.py @@ -3,7 +3,7 @@ def get_config_dict(config_dict, section="default"): zino_dict = config_dict.get('zino', {}) - if not zino_dict or not 'connections' in zino_dict: + if not zino_dict or 'connections' not in zino_dict: return {} if zino_dict["connections"][section]: connection = zino_dict["connections"][section] diff --git a/src/howitz/error_handlers.py b/src/howitz/error_handlers.py index 49b4377..6d54b79 100644 --- a/src/howitz/error_handlers.py +++ b/src/howitz/error_handlers.py @@ -14,7 +14,7 @@ def handle_generic_http_exception(e): alert_random_id = str(uuid.uuid4()) short_err_msg = f"{e.code} {e.name}: {e.description}" - if not "errors" in session: + if "errors" not in session: session["errors"] = dict() session["errors"][str(alert_random_id)] = serialize_exception(e) session.modified = True @@ -39,7 +39,7 @@ def handle_generic_exception(e): except IndexError: short_err_msg = 'An unexpected error has occurred' - if not "errors" in session: + if "errors" not in session: session["errors"] = dict() session["errors"][str(alert_random_id)] = serialize_exception(e) session.modified = True @@ -97,7 +97,7 @@ def handle_lost_connection(e): except IndexError: short_err_msg = 'Temporarily lost connection to Zino server' - if not "errors" in session: + if "errors" not in session: session["errors"] = dict() session["errors"][str(alert_random_id)] = serialize_exception(e) session.modified = True From e56a6466bd6592ad7f69ac46f79dea2237ae453a Mon Sep 17 00:00:00 2001 From: Hanne Moa Date: Mon, 17 Jun 2024 12:53:40 +0200 Subject: [PATCH 2/6] Remove unused imports --- src/howitz/__init__.py | 2 +- src/howitz/config/howitz.py | 2 -- src/howitz/endpoints.py | 2 -- src/howitz/users/utils.py | 2 -- 4 files changed, 1 insertion(+), 7 deletions(-) diff --git a/src/howitz/__init__.py b/src/howitz/__init__.py index fbf2f2d..68cb1da 100644 --- a/src/howitz/__init__.py +++ b/src/howitz/__init__.py @@ -4,7 +4,7 @@ from logging.config import dictConfig from flask_caching import Cache -from flask import Flask, g, redirect, url_for, current_app +from flask import Flask, redirect, url_for, current_app from flask.logging import default_handler from flask_assets import Bundle, Environment from flask_login import LoginManager, logout_user diff --git a/src/howitz/config/howitz.py b/src/howitz/config/howitz.py index 104b898..a9c9da5 100644 --- a/src/howitz/config/howitz.py +++ b/src/howitz/config/howitz.py @@ -1,5 +1,3 @@ -from pathlib import Path - from zinolib.config.toml import parse_toml_config from .models import HowitzConfig, DevHowitzConfig diff --git a/src/howitz/endpoints.py b/src/howitz/endpoints.py index 7fa377d..b07c250 100644 --- a/src/howitz/endpoints.py +++ b/src/howitz/endpoints.py @@ -1,11 +1,9 @@ -import os from enum import Enum from flask import ( Blueprint, current_app, flash, - g, make_response, redirect, render_template, diff --git a/src/howitz/users/utils.py b/src/howitz/users/utils.py index 1036ace..b854ed8 100644 --- a/src/howitz/users/utils.py +++ b/src/howitz/users/utils.py @@ -1,5 +1,3 @@ -import hashlib - from werkzeug.exceptions import Forbidden from werkzeug.security import generate_password_hash, check_password_hash From 7b4498666689a4dbbdf3f25a8e3a20ef7307f57e Mon Sep 17 00:00:00 2001 From: Hanne Moa Date: Mon, 17 Jun 2024 12:55:55 +0200 Subject: [PATCH 3/6] Remove or use unused variables --- src/howitz/endpoints.py | 8 ++++---- src/howitz/users/model.py | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/howitz/endpoints.py b/src/howitz/endpoints.py index b07c250..4542f39 100644 --- a/src/howitz/endpoints.py +++ b/src/howitz/endpoints.py @@ -569,13 +569,13 @@ def update_event_status(event_id): try: if not current_state == new_state: - set_state_res = current_app.event_manager.change_admin_state_for_id(event_id, AdmState(new_state)) + current_app.event_manager.change_admin_state_for_id(event_id, AdmState(new_state)) except EventClosedError as closedErr: current_app.logger.exception('EventClosedError %s', closedErr) raise BadRequest(description=closedErr.args[0]) from closedErr if new_history: - add_history_res = current_app.event_manager.add_history_entry_for_id(event_id, new_history) + current_app.event_manager.add_history_entry_for_id(event_id, new_history) event_attr, event_logs, event_history, event_msgs = get_event_details(event_id) event = create_table_event(current_app.event_manager.create_event_from_id(event_id))["event"] @@ -605,13 +605,13 @@ def bulk_update_events_status(): for event_id in selected_events: try: if new_state: - set_state_res = current_app.event_manager.change_admin_state_for_id(int(event_id), AdmState(new_state)) + current_app.event_manager.change_admin_state_for_id(int(event_id), AdmState(new_state)) except EventClosedError as closedErr: current_app.logger.exception('EventClosedError %s', closedErr) raise BadRequest(description=closedErr.args[0]) from closedErr if new_history: - add_history_res = current_app.event_manager.add_history_entry_for_id(int(event_id), new_history) + current_app.event_manager.add_history_entry_for_id(int(event_id), new_history) # Clear selected events session["selected_events"] = {} diff --git a/src/howitz/users/model.py b/src/howitz/users/model.py index fdb3f5d..648a6b6 100644 --- a/src/howitz/users/model.py +++ b/src/howitz/users/model.py @@ -12,7 +12,7 @@ class User(UserMixin, BaseModel): def __str__(self): token = "'SET'" if self.token else "'NOT SET'" password = "'SET'" if self.password.startswith(('scrypt:', 'pdkbdf2:')) else "'NOT SET'" - return f'username={self.username} password=XXX token=XXX' + return f'username={self.username} password={password} token={token}' def get_id(self): return self.username From b78ecba2ce902033ae586e33e3bb6df586ae7819 Mon Sep 17 00:00:00 2001 From: Hanne Moa Date: Mon, 17 Jun 2024 12:57:56 +0200 Subject: [PATCH 4/6] Remove f-prefix from static strings --- src/howitz/users/commands.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/howitz/users/commands.py b/src/howitz/users/commands.py index 863837d..e0181d3 100644 --- a/src/howitz/users/commands.py +++ b/src/howitz/users/commands.py @@ -37,7 +37,7 @@ def create_user(username, password, token): def update_user(username, password, token): with current_app.app_context(): if not (password or token): - click.echo(f'Neither token nor password given, aborting', err=True) + click.echo('Neither token nor password given, aborting', err=True) sys.exit(1) user = current_app.database.get(username) if not user: @@ -75,7 +75,7 @@ def list_users(): with current_app.app_context(): users = current_app.database.get_all() if not users: - click.echo(f'No users found, aborting', err=True) + click.echo('No users found, aborting', err=True) sys.exit(1) for user in users: click.echo(user.username) From 03320cd533e077aab4810743a2e82dd04c5adab5 Mon Sep 17 00:00:00 2001 From: Hanne Moa Date: Mon, 17 Jun 2024 14:46:21 +0200 Subject: [PATCH 5/6] Update test hit by lint-fix --- tests/test_users_model.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_users_model.py b/tests/test_users_model.py index a841f1f..06f5ae2 100644 --- a/tests/test_users_model.py +++ b/tests/test_users_model.py @@ -10,7 +10,7 @@ class UserTest(unittest.TestCase): def test_print_user_return_username(self): user = User(**{'username': 'foo', 'password': 'bar', 'token': 'xux'}) - self.assertEqual(str(user), 'username=foo password=XXX token=XXX') + self.assertEqual(str(user), 'username=foo password=SET token=SET') def test_autenticater_with_correct_password_returns_true(self): user = User(**{'username': 'foo', 'password': 'bar', 'token': 'xux'}) From 56b4b512ef142f5fa5dc0f0c255199a5f51f316b Mon Sep 17 00:00:00 2001 From: Hanne Moa Date: Mon, 17 Jun 2024 15:17:34 +0200 Subject: [PATCH 6/6] fixup, this was weird --- src/howitz/users/model.py | 5 ++--- tests/test_users_model.py | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/howitz/users/model.py b/src/howitz/users/model.py index 648a6b6..19e5524 100644 --- a/src/howitz/users/model.py +++ b/src/howitz/users/model.py @@ -10,9 +10,8 @@ class User(UserMixin, BaseModel): token: str def __str__(self): - token = "'SET'" if self.token else "'NOT SET'" - password = "'SET'" if self.password.startswith(('scrypt:', 'pdkbdf2:')) else "'NOT SET'" - return f'username={self.username} password={password} token={token}' + token = "SET" if self.token else "NOT SET" + return f'username={self.username} *** token="{token}"' def get_id(self): return self.username diff --git a/tests/test_users_model.py b/tests/test_users_model.py index 06f5ae2..41fad8d 100644 --- a/tests/test_users_model.py +++ b/tests/test_users_model.py @@ -10,7 +10,7 @@ class UserTest(unittest.TestCase): def test_print_user_return_username(self): user = User(**{'username': 'foo', 'password': 'bar', 'token': 'xux'}) - self.assertEqual(str(user), 'username=foo password=SET token=SET') + self.assertEqual(str(user), 'username=foo *** token="SET"') def test_autenticater_with_correct_password_returns_true(self): user = User(**{'username': 'foo', 'password': 'bar', 'token': 'xux'})