From e864c90936157be5452e81521a717208761ca056 Mon Sep 17 00:00:00 2001 From: Jelle van der Waa Date: Fri, 3 Nov 2023 12:24:37 +0100 Subject: [PATCH] ruff: enable flake8-bugbear except B904 Resolve B904 in a later commit. --- feeds.py | 8 ++++---- main/tests/test_templatetags_pgp.py | 2 +- ruff.toml | 3 ++- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/feeds.py b/feeds.py index fc4bccdc..8325de5d 100644 --- a/feeds.py +++ b/feeds.py @@ -80,13 +80,13 @@ def get_object(self, request, arch='', repo=''): r = Repo.objects.filter(testing=False, staging=False) qs = qs.filter(repo__in=r) obj['repos'] = r - setattr(obj['repos'], 'name', 'all stable repositories') + obj['repos'].name = 'all stable repositories' elif repo == 'testing-repos': # feed for a single arch AND all testing repos r = Repo.objects.filter(testing=True, staging=False) qs = qs.filter(repo__in=r) obj['repos'] = r - setattr(obj['repos'], 'name', 'all testing repositories') + obj['repos'].name = 'all testing repositories' else: # feed for a single arch AND repo r = Repo.objects.get(name__iexact=repo) @@ -210,13 +210,13 @@ def get_object(self, request, operation='', arch='', repo=''): r = Repo.objects.filter(testing=False, staging=False) qs = qs.filter(repo__in=r) obj['repos'] = r - setattr(obj['repos'], 'name', 'all stable repositories') + obj['repos'].name = 'all stable repositories' elif repo == 'testing-repos': # feed for a single arch AND all testing repos r = Repo.objects.filter(testing=True, staging=False) qs = qs.filter(repo__in=r) obj['repos'] = r - setattr(obj['repos'], 'name', 'all testing repositories') + obj['repos'].name = 'all testing repositories' else: # feed for a single arch AND repo r = Repo.objects.get(name__iexact=repo) diff --git a/main/tests/test_templatetags_pgp.py b/main/tests/test_templatetags_pgp.py index 437e13be..38a34a6a 100644 --- a/main/tests/test_templatetags_pgp.py +++ b/main/tests/test_templatetags_pgp.py @@ -54,7 +54,7 @@ def test_pgp_key_link(settings): assert_pgp_key_link('0xA10E234343EA8BDC7FF5E34A12F') pgp_key = '423423fD9004FB063E2C81117BFB1108D234DAFZ' - server = getattr(settings, 'PGP_SERVER') + server = settings.PGP_SERVER settings.PGP_SERVER = '' assert server not in pgp_key_link(pgp_key) diff --git a/ruff.toml b/ruff.toml index f29d9de5..078e8675 100644 --- a/ruff.toml +++ b/ruff.toml @@ -1,4 +1,5 @@ select = [ + "B", # flake8-bugbear "C4", # flake8-comprehensions "E", # pycodestyle "F", # pyflakes @@ -16,4 +17,4 @@ select = [ ] # Never enforce `E501` (line length violations). -ignore = ["E501", "E731"] +ignore = ["E501", "E731", "B904"]