From 0c540293d8bedbdaaa9ff8b236115cb64623cefb Mon Sep 17 00:00:00 2001 From: Zedifus Date: Sat, 2 Apr 2022 02:34:12 +0100 Subject: [PATCH 1/4] Fix Singleton value testing Truthy falsy truthy falsy, apparently wants 'is' --- app/classes/models/management.py | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/app/classes/models/management.py b/app/classes/models/management.py index df25e5a0..c8842a3a 100644 --- a/app/classes/models/management.py +++ b/app/classes/models/management.py @@ -322,8 +322,7 @@ class helpers_management: @staticmethod def get_schedules_enabled(): - # pylint: disable=singleton-comparison - return Schedules.select().where(Schedules.enabled == True).execute() + return Schedules.select().where(Schedules.enabled is True).execute() # ********************************************************************************** # Backups Methods @@ -435,12 +434,9 @@ class helpers_management: @staticmethod def clear_unexecuted_commands(): - Commands.update( - { - Commands.executed: True - # pylint: disable=singleton-comparison - } - ).where(Commands.executed == False).execute() + Commands.update({Commands.executed: True}).where( + Commands.executed is False + ).execute() management_helper = helpers_management() From db70f9ae20e39ab8821fe7f9efc24815e4699384 Mon Sep 17 00:00:00 2001 From: Zedifus Date: Sat, 2 Apr 2022 02:49:48 +0100 Subject: [PATCH 2/4] Fix W0221 emptyline override Package advises override, see !233 for doc reference. --- app/classes/shared/command.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/classes/shared/command.py b/app/classes/shared/command.py index 0df70648..79243fc8 100644 --- a/app/classes/shared/command.py +++ b/app/classes/shared/command.py @@ -21,12 +21,12 @@ class MainPrompt(cmd.Cmd): # overrides the default Prompt prompt = f"Crafty Controller v{helper.get_version_string()} > " + # see MR !233 for pylint exemptino reason @staticmethod - def emptyline(): + def emptyline(): # pylint: disable=arguments-differ pass - # pylint: disable=unused-argument - def do_exit(self, line): + def do_exit(self, _line): self.tasks_manager._main_graceful_exit() self.universal_exit() From e6b1eef4c25d864cde839a8327c3be4403e2762c Mon Sep 17 00:00:00 2001 From: Zedifus Date: Sat, 2 Apr 2022 02:58:31 +0100 Subject: [PATCH 3/4] Remove more unnecessary singleton lint exemptions If testing truthy/falsy we should be using is --- app/classes/models/server_permissions.py | 3 +-- app/classes/models/servers.py | 3 +-- app/classes/models/users.py | 6 ++---- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/app/classes/models/server_permissions.py b/app/classes/models/server_permissions.py index 92ecbd09..73955bae 100644 --- a/app/classes/models/server_permissions.py +++ b/app/classes/models/server_permissions.py @@ -227,8 +227,7 @@ class Permissions_Servers: def get_server_user_list(server_id): final_users = [] server_roles = Role_Servers.select().where(Role_Servers.server_id == server_id) - # pylint: disable=singleton-comparison - super_users = Users.select().where(Users.superuser == True) + super_users = Users.select().where(Users.superuser is True) for role in server_roles: users = User_Roles.select().where(User_Roles.role_id == role.role_id) for user in users: diff --git a/app/classes/models/servers.py b/app/classes/models/servers.py index f9c777a1..f00704fe 100644 --- a/app/classes/models/servers.py +++ b/app/classes/models/servers.py @@ -260,8 +260,7 @@ class helper_servers: @staticmethod def is_crashed(server_id): svr = Server_Stats.select().where(Server_Stats.server_id == server_id).get() - # pylint: disable=singleton-comparison - if svr.crashed == True: + if svr.crashed is True: return True else: return False diff --git a/app/classes/models/users.py b/app/classes/models/users.py index dbe189c7..dae72480 100644 --- a/app/classes/models/users.py +++ b/app/classes/models/users.py @@ -221,8 +221,7 @@ class helper_users: @staticmethod def get_super_user_list(): final_users = [] - # pylint: disable=singleton-comparison - super_users = Users.select().where(Users.superuser == True) + super_users = Users.select().where(Users.superuser is True) for suser in super_users: if suser.user_id not in final_users: final_users.append(suser.user_id) @@ -251,8 +250,7 @@ class helper_users: @staticmethod def clear_support_status(): - # pylint: disable=singleton-comparison - Users.update(preparing=False).where(Users.preparing == True).execute() + Users.update(preparing=False).where(Users.preparing is True).execute() @staticmethod def user_id_exists(user_id): From 23ecef682658c9e6c846688b05e9b50823d49de9 Mon Sep 17 00:00:00 2001 From: Zedifus Date: Sat, 2 Apr 2022 17:54:30 +0100 Subject: [PATCH 4/4] Revert Singleton testing operators on db querys These are not compatible with peewee querys, see MR !233 for details --- app/classes/models/management.py | 8 ++++++-- app/classes/models/server_permissions.py | 4 +++- app/classes/models/users.py | 8 ++++++-- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/app/classes/models/management.py b/app/classes/models/management.py index c8842a3a..0d33e547 100644 --- a/app/classes/models/management.py +++ b/app/classes/models/management.py @@ -322,7 +322,11 @@ class helpers_management: @staticmethod def get_schedules_enabled(): - return Schedules.select().where(Schedules.enabled is True).execute() + return ( + Schedules.select() + .where(Schedules.enabled == True) # pylint: disable=singleton-comparison + .execute() + ) # ********************************************************************************** # Backups Methods @@ -435,7 +439,7 @@ class helpers_management: @staticmethod def clear_unexecuted_commands(): Commands.update({Commands.executed: True}).where( - Commands.executed is False + Commands.executed == False # pylint: disable=singleton-comparison ).execute() diff --git a/app/classes/models/server_permissions.py b/app/classes/models/server_permissions.py index 73955bae..6f5a0241 100644 --- a/app/classes/models/server_permissions.py +++ b/app/classes/models/server_permissions.py @@ -227,7 +227,9 @@ class Permissions_Servers: def get_server_user_list(server_id): final_users = [] server_roles = Role_Servers.select().where(Role_Servers.server_id == server_id) - super_users = Users.select().where(Users.superuser is True) + super_users = Users.select().where( + Users.superuser == True # pylint: disable=singleton-comparison + ) for role in server_roles: users = User_Roles.select().where(User_Roles.role_id == role.role_id) for user in users: diff --git a/app/classes/models/users.py b/app/classes/models/users.py index dae72480..b9dd1d81 100644 --- a/app/classes/models/users.py +++ b/app/classes/models/users.py @@ -221,7 +221,9 @@ class helper_users: @staticmethod def get_super_user_list(): final_users = [] - super_users = Users.select().where(Users.superuser is True) + super_users = Users.select().where( + Users.superuser == True # pylint: disable=singleton-comparison + ) for suser in super_users: if suser.user_id not in final_users: final_users.append(suser.user_id) @@ -250,7 +252,9 @@ class helper_users: @staticmethod def clear_support_status(): - Users.update(preparing=False).where(Users.preparing is True).execute() + Users.update(preparing=False).where( + Users.preparing == True # pylint: disable=singleton-comparison + ).execute() @staticmethod def user_id_exists(user_id):