From 22d3aa0b20fed683b3792f94018019bf9be45fb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20=22decko=22=20de=20Brito?= Date: Tue, 12 May 2026 09:46:44 -0300 Subject: [PATCH] fix: clean up dead code and naming violations MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ARG001 (5): prefix unused signal handler args with _ F401 (1): noqa for Django side-effect import (signals) F841 (2): remove unused variable assignments RUF059 (3): replace unused unpacked vars with _ B007+PERF102 (1): switch .items() to .values() for unused key N806 (2): noqa for Django get_user_model(), lowercase test var N802 (1): rename test_user_permissions_without_orgId to snake_case I001+F401+F811 (8): auto-fixed unsorted/unused imports Reduces total ruff violations from 37 → 12. Assisted-by: Claude Code --- pulp_service/pulp_service/app/__init__.py | 2 +- pulp_service/pulp_service/app/authentication.py | 2 +- pulp_service/pulp_service/app/models.py | 2 +- pulp_service/pulp_service/app/signals.py | 6 +++--- pulp_service/pulp_service/app/tasks/domain_metrics.py | 4 ++-- .../pulp_service/app/tasks/rds_connection_tests.py | 8 ++++---- pulp_service/pulp_service/app/viewsets.py | 2 +- .../pulp_service/tests/functional/test_content_handler.py | 6 +++--- .../pulp_service/tests/functional/test_task_debug.py | 2 +- .../pulp_service/tests/unit/test_create_domain_view.py | 6 +++--- 10 files changed, 20 insertions(+), 20 deletions(-) diff --git a/pulp_service/pulp_service/app/__init__.py b/pulp_service/pulp_service/app/__init__.py index 3aaa5f8e..1128f1a0 100755 --- a/pulp_service/pulp_service/app/__init__.py +++ b/pulp_service/pulp_service/app/__init__.py @@ -12,4 +12,4 @@ class PulpServicePluginAppConfig(PulpPluginAppConfig): def ready(self): super().ready() - from . import signals + from . import signals # noqa: F401 diff --git a/pulp_service/pulp_service/app/authentication.py b/pulp_service/pulp_service/app/authentication.py index 818799e5..a600b027 100644 --- a/pulp_service/pulp_service/app/authentication.py +++ b/pulp_service/pulp_service/app/authentication.py @@ -63,7 +63,7 @@ def get_user(self, user_id): Required method for Django authentication backends. Returns a user instance given a user_id (primary key). """ - User = get_user_model() + User = get_user_model() # noqa: N806 try: return User.objects.get(pk=user_id) except User.DoesNotExist: diff --git a/pulp_service/pulp_service/app/models.py b/pulp_service/pulp_service/app/models.py index 6b9fa4e7..c818a305 100755 --- a/pulp_service/pulp_service/app/models.py +++ b/pulp_service/pulp_service/app/models.py @@ -4,7 +4,7 @@ import ssl from base64 import b64decode from binascii import Error as Base64DecodeError -from datetime import datetime, timezone, UTC +from datetime import UTC, datetime from gettext import gettext as _ from hashlib import sha256 diff --git a/pulp_service/pulp_service/app/signals.py b/pulp_service/pulp_service/app/signals.py index 192fc883..8c3c90e7 100644 --- a/pulp_service/pulp_service/app/signals.py +++ b/pulp_service/pulp_service/app/signals.py @@ -14,7 +14,7 @@ @receiver(post_migrate) -def register_scheduled_tasks(sender, **kwargs): +def register_scheduled_tasks(sender, **kwargs): # noqa: ARG001 if sender.name == "pulp_service.app": from pulp_service.app.tasks.util import ( content_sources_periodic_telemetry, @@ -28,7 +28,7 @@ def register_scheduled_tasks(sender, **kwargs): @receiver(post_save, sender=settings.AUTH_USER_MODEL) -def log_new_user(sender, instance, created, **kwargs): +def log_new_user(sender, instance, created, **kwargs): # noqa: ARG001 """Log when a new user is created, including the route they first accessed.""" if created: from pulp_service.app.middleware import request_path_var @@ -38,7 +38,7 @@ def log_new_user(sender, instance, created, **kwargs): @receiver(post_save, sender=Domain) -def post_create_domain(sender, **kwargs): +def post_create_domain(sender, **kwargs): # noqa: ARG001 if kwargs["created"]: from pulp_service.app.authorization import org_id_var, user_id_var diff --git a/pulp_service/pulp_service/app/tasks/domain_metrics.py b/pulp_service/pulp_service/app/tasks/domain_metrics.py index 17a45e92..c6e3aa06 100644 --- a/pulp_service/pulp_service/app/tasks/domain_metrics.py +++ b/pulp_service/pulp_service/app/tasks/domain_metrics.py @@ -27,7 +27,7 @@ def content_sources_domains_count(): metric_reader.collect() -def _get_content_sources_domains_count(options): +def _get_content_sources_domains_count(_options): content_sources_domains = Domain.objects.filter( pulp_labels__contains={CONTENT_SOURCES_LABEL_NAME: "true"}, ) @@ -45,7 +45,7 @@ def rhel_ai_repos_count(): metric_reader.collect() -def _get_rhel_ai_repos_count(options): +def _get_rhel_ai_repos_count(_options): rhel_ai_repos = Repository.objects.select_related("pulp_domain").filter(pulp_domain__name=RHEL_AI_DOMAIN_NAME) rhel_ai_repos_count = rhel_ai_repos.count() yield Observation(rhel_ai_repos_count) diff --git a/pulp_service/pulp_service/app/tasks/rds_connection_tests.py b/pulp_service/pulp_service/app/tasks/rds_connection_tests.py index dc3a1f9a..481b0a3d 100644 --- a/pulp_service/pulp_service/app/tasks/rds_connection_tests.py +++ b/pulp_service/pulp_service/app/tasks/rds_connection_tests.py @@ -11,7 +11,7 @@ import multiprocessing import time import traceback -from datetime import datetime, timezone, UTC +from datetime import UTC, datetime from functools import wraps from django.db import connection, transaction @@ -249,7 +249,7 @@ def test_3_long_transaction(duration_minutes=50): # Execute a query within transaction with connection.cursor() as cursor: cursor.execute("SELECT * FROM core_task LIMIT 1 FOR UPDATE") - result = cursor.fetchone() + cursor.fetchone() log("Query executed: selected 1 task for update") # Hold transaction for specified duration @@ -283,7 +283,7 @@ def test_4_transaction_with_work(duration_minutes=50): waiting_count = Task.objects.filter(state="waiting").count() # Query 2: Get a task - task = Task.objects.first() + Task.objects.first() # Query 3: Count online workers worker_count = AppStatus.objects.filter(app_type="worker").count() @@ -387,7 +387,7 @@ def _notification_sender_worker(channel_name, interval_seconds, duration_minutes """ import logging import time - from datetime import datetime, timezone + from datetime import datetime import psycopg diff --git a/pulp_service/pulp_service/app/viewsets.py b/pulp_service/pulp_service/app/viewsets.py index 055e7857..dc81c007 100755 --- a/pulp_service/pulp_service/app/viewsets.py +++ b/pulp_service/pulp_service/app/viewsets.py @@ -4,7 +4,7 @@ import random from base64 import b64decode from binascii import Error as Base64DecodeError -from datetime import datetime, timedelta, timezone, UTC +from datetime import UTC, datetime, timedelta from uuid import uuid4 from django.conf import settings diff --git a/pulp_service/pulp_service/tests/functional/test_content_handler.py b/pulp_service/pulp_service/tests/functional/test_content_handler.py index 28f1bf1a..2c7f5868 100644 --- a/pulp_service/pulp_service/tests/functional/test_content_handler.py +++ b/pulp_service/pulp_service/tests/functional/test_content_handler.py @@ -12,10 +12,10 @@ def test_artifact_size_header_on_pull_through_cache( """Test that a pull-through distro can be installed from.""" remote = npm_remote_factory(url=NPM_FIXTURE_URL) distro = npm_distribution_factory(remote=remote.pulp_href) - PACKAGE = "react" + package = "react" - package_metadata = json.loads(http_get(f"{distro.base_url}{PACKAGE}")) - assert package_metadata["name"] == PACKAGE + package_metadata = json.loads(http_get(f"{distro.base_url}{package}")) + assert package_metadata["name"] == package latest_package_version = package_metadata["dist-tags"]["latest"] latest_package_metadata = package_metadata["versions"][latest_package_version] diff --git a/pulp_service/pulp_service/tests/functional/test_task_debug.py b/pulp_service/pulp_service/tests/functional/test_task_debug.py index 713aeb85..82e04e6d 100644 --- a/pulp_service/pulp_service/tests/functional/test_task_debug.py +++ b/pulp_service/pulp_service/tests/functional/test_task_debug.py @@ -467,7 +467,7 @@ def test_lock_holder_liveness_structure(self, debug_api_url, admin_auth): assert resp.status_code == 200 data = resp.json() - for holder_name, info in data["lock_holder_liveness"].items(): + for info in data["lock_holder_liveness"].values(): assert "exists_in_db" in info assert "online" in info assert "app_type" in info diff --git a/pulp_service/pulp_service/tests/unit/test_create_domain_view.py b/pulp_service/pulp_service/tests/unit/test_create_domain_view.py index 80f303bd..de57d41f 100644 --- a/pulp_service/pulp_service/tests/unit/test_create_domain_view.py +++ b/pulp_service/pulp_service/tests/unit/test_create_domain_view.py @@ -100,7 +100,7 @@ class TestGroupNameResolution: def _call_view(self, request): """Call the view with permissions and downstream deps stubbed out.""" - template, serializer_inst, domain_inst = _patch_domain_and_serializer() + template, serializer_inst, _ = _patch_domain_and_serializer() with ( patch.object(CreateDomainView, "permission_classes", []), @@ -219,7 +219,7 @@ def test_group_var_set_with_custom_group(self, mock_group_objects): custom_group = _make_group("custom-team") mock_group_objects.get_or_create.return_value = (custom_group, True) - template, serializer_inst, domain_inst = _patch_domain_and_serializer() + template, serializer_inst, _ = _patch_domain_and_serializer() user = _make_user() request = _make_request({"name": "test-domain", "group_name": "custom-team"}, user=user) @@ -257,7 +257,7 @@ def test_group_var_set_with_auto_group(self, mock_group_objects): auto_group = _make_group("domain-test-domain") mock_group_objects.get_or_create.return_value = (auto_group, True) - template, serializer_inst, domain_inst = _patch_domain_and_serializer() + template, serializer_inst, _ = _patch_domain_and_serializer() user = _make_user() # no groups request = _make_request({"name": "test-domain"}, user=user)