move imports to top-level

Author: furlongm

hosts/views.py

@@ -15,6 +15,8 @@
 # You should have received a copy of the GNU General Public License
 # along with Patchman. If not, see <http://www.gnu.org/licenses/>
 
+from urllib.parse import parse_qs
+
 from django.contrib import messages
 from django.contrib.auth.decorators import login_required
 from django.db.models import Q
@@ -31,6 +33,7 @@
 from hosts.models import Host, HostRepo
 from hosts.serializers import HostRepoSerializer, HostSerializer
 from hosts.tables import HostTable
+from hosts.tasks import find_host_updates
 from operatingsystems.models import OSRelease, OSVariant
 from reports.models import Report
 from util import sanitize_filter_params
@@ -39,7 +42,6 @@
 
 def _get_filtered_hosts(filter_params):
     """Helper to reconstruct filtered queryset from filter params."""
-    from urllib.parse import parse_qs
     params = parse_qs(filter_params)
 
     hosts = Host.objects.select_related('osvariant', 'arch', 'domain')
@@ -222,7 +224,6 @@ def host_delete(request, hostname):
 def host_find_updates(request, hostname):
     """ Find updates using a celery task
     """
-    from hosts.tasks import find_host_updates
     host = get_object_or_404(Host, hostname=hostname)
     find_host_updates.delay(host.id)
     text = f'Finding updates for Host {host}'
@@ -261,7 +262,6 @@ def host_bulk_action(request):
     name = Host._meta.verbose_name if count == 1 else Host._meta.verbose_name_plural
 
     if action == 'find_updates':
-        from hosts.tasks import find_host_updates
         for host in hosts:
             find_host_updates.delay(host.id)
         messages.success(request, f'Queued {count} {name} for update check')

operatingsystems/views.py

@@ -15,6 +15,8 @@
 # You should have received a copy of the GNU General Public License
 # along with Patchman. If not, see <http://www.gnu.org/licenses/>
 
+from urllib.parse import parse_qs
+
 from django.contrib import messages
 from django.contrib.auth.decorators import login_required
 from django.db.models import Count, Q
@@ -37,7 +39,6 @@
 
 def _get_filtered_osvariants(filter_params):
     """Helper to reconstruct filtered queryset from filter params."""
-    from urllib.parse import parse_qs
     params = parse_qs(filter_params)
 
     osvariants = OSVariant.objects.select_related('osrelease', 'arch')
@@ -57,7 +58,6 @@ def _get_filtered_osvariants(filter_params):
 
 def _get_filtered_osreleases(filter_params):
     """Helper to reconstruct filtered queryset from filter params."""
-    from urllib.parse import parse_qs
     params = parse_qs(filter_params)
 
     osreleases = OSRelease.objects.all()

packages/utils.py

@@ -19,6 +19,7 @@
 
 from django.core.exceptions import MultipleObjectsReturned
 from django.db import IntegrityError, transaction
+from django.db.models import Count, Min
 
 from arch.models import PackageArchitecture
 from packages.models import (

reports/views.py

@@ -16,8 +16,9 @@
 # along with Patchman. If not, see <http://www.gnu.org/licenses/>
 
 import json
-from urllib.parse import unquote
+from urllib.parse import parse_qs, unquote
 
+from django.conf import settings
 from django.contrib import messages
 from django.contrib.auth.decorators import login_required
 from django.db.models import Q
@@ -28,21 +29,26 @@
 from django.views.decorators.csrf import csrf_exempt
 from django_tables2 import RequestConfig
 from rest_framework import status, viewsets
+from rest_framework.permissions import AllowAny, IsAuthenticatedOrReadOnly
 from rest_framework.response import Response
+from rest_framework_api_key.permissions import HasAPIKey
 from tenacity import (
     retry, retry_if_exception_type, stop_after_attempt, wait_exponential,
 )
 
 from reports.models import Report
-from reports.serializers import ReportUploadSerializer
-from reports.tables import ReportTable
+from reports.serializers import ReportSerializer, ReportUploadSerializer
+from reports.tables import (
+    ReportModuleTable, ReportPackageTable, ReportRepoTable, ReportTable,
+    ReportUpdateTable,
+)
+from reports.tasks import process_report
 from util import sanitize_filter_params
 from util.filterspecs import Filter, FilterBar
 
 
 def _get_filtered_reports(filter_params):
     """Helper to reconstruct filtered queryset from filter params."""
-    from urllib.parse import parse_qs
     params = parse_qs(filter_params)
 
     reports = Report.objects.all()
@@ -78,7 +84,6 @@ def upload(request):
         report = Report.objects.create()
         report.parse(data, meta)
 
-        from reports.tasks import process_report
         process_report.delay(report.id)
 
         if 'report' in data and data['report'] == 'true':
@@ -159,10 +164,6 @@ def report_detail(request, report_id):
 
     # Add tables for Protocol 2 reports
     if report.protocol == '2':
-        from reports.tables import (
-            ReportModuleTable, ReportPackageTable, ReportRepoTable,
-            ReportUpdateTable,
-        )
         if report.has_packages:
             context['packages_table'] = ReportPackageTable(report.packages_parsed)
         if report.has_repos:
@@ -183,7 +184,6 @@ def report_detail(request, report_id):
 def report_process(request, report_id):
     """ Process a report using a celery task
     """
-    from reports.tasks import process_report
     report = get_object_or_404(Report, id=report_id)
     report.processed = False
     report.save()
@@ -243,7 +243,6 @@ def report_bulk_action(request):
     name = Report._meta.verbose_name if count == 1 else Report._meta.verbose_name_plural
 
     if action == 'process':
-        from reports.tasks import process_report
         for report in reports:
             report.processed = False
             report.save()
@@ -273,12 +272,6 @@ class ReportViewSet(viewsets.ViewSet):
     """
 
     def get_permissions(self):
-        from django.conf import settings
-        from rest_framework.permissions import (
-            AllowAny, IsAuthenticatedOrReadOnly,
-        )
-        from rest_framework_api_key.permissions import HasAPIKey
-
         # POST requires API key if configured, otherwise allow any
         if self.action == 'create':
             if getattr(settings, 'REQUIRE_API_KEY', False):
@@ -289,16 +282,12 @@ def get_permissions(self):
 
     def list(self, request):
         """List all reports."""
-        from reports.serializers import ReportSerializer
         queryset = Report.objects.all().order_by('-created')
         serializer = ReportSerializer(queryset, many=True, context={'request': request})
         return Response(serializer.data)
 
     def retrieve(self, request, pk=None):
         """Retrieve a single report."""
-        from django.shortcuts import get_object_or_404
-
-        from reports.serializers import ReportSerializer
         report = get_object_or_404(Report, pk=pk)
         serializer = ReportSerializer(report, context={'request': request})
         return Response(serializer.data)
@@ -357,7 +346,6 @@ def create(self, request):
         )
 
         # Queue for async processing
-        from reports.tasks import process_report
         process_report.delay(report.id)
 
         return Response(

repos/views.py

@@ -15,6 +15,8 @@
 # You should have received a copy of the GNU General Public License
 # along with Patchman. If not, see <http://www.gnu.org/licenses/>
 
+from urllib.parse import parse_qs
+
 from django.contrib import messages
 from django.contrib.auth.decorators import login_required
 from django.db import IntegrityError
@@ -36,6 +38,7 @@
     MirrorPackageSerializer, MirrorSerializer, RepositorySerializer,
 )
 from repos.tables import MirrorTable, RepositoryTable
+from repos.tasks import refresh_repo
 from util import sanitize_filter_params
 from util.filterspecs import Filter, FilterBar
 
@@ -403,7 +406,6 @@ def repo_toggle_security(request, repo_id):
 def repo_refresh(request, repo_id):
     """ Refresh a repo using a celery task
     """
-    from repos.tasks import refresh_repo
     repo = get_object_or_404(Repository, id=repo_id)
     refresh_repo.delay(repo.id)
     text = f'Repostory {repo} is being refreshed'
@@ -413,7 +415,6 @@ def repo_refresh(request, repo_id):
 
 def _get_filtered_repos(filter_params):
     """Helper to reconstruct filtered queryset from filter params."""
-    from urllib.parse import parse_qs
     params = parse_qs(filter_params)
 
     repos = Repository.objects.select_related('arch').order_by('name')
@@ -486,7 +487,6 @@ def repo_bulk_action(request):
         repos.update(security=False)
         messages.success(request, f'Marked {count} {name} as non-security')
     elif action == 'refresh':
-        from repos.tasks import refresh_repo
         for repo in repos:
             refresh_repo.delay(repo.id)
         messages.success(request, f'Queued {count} {name} for refresh')
@@ -504,7 +504,6 @@ def repo_bulk_action(request):
 
 def _get_filtered_mirrors(filter_params):
     """Helper to reconstruct filtered queryset from filter params."""
-    from urllib.parse import parse_qs
     params = parse_qs(filter_params)
 
     mirrors = Mirror.objects.select_related('repo').order_by('packages_checksum')

util/context_processors.py

@@ -16,6 +16,7 @@
 
 import subprocess
 from datetime import timedelta
+from importlib.metadata import version as get_pkg_version
 from pathlib import Path
 
 from django.db.models import F
@@ -52,8 +53,7 @@ def _get_version():
     """Get version from package metadata or VERSION.txt."""
     # Try importlib.metadata first (for installed packages)
     try:
-        from importlib.metadata import version
-        return version('patchman')
+        return get_pkg_version('patchman')
     except Exception:
         pass
 

util/templatetags/common.py

@@ -18,8 +18,8 @@
 from datetime import timedelta
 from urllib.parse import urlencode
 
-from django.template import Library
 from django.db.models import Sum
+from django.template import Library, engines
 from django.template.loader import get_template
 from django.utils import timezone
 from django.utils.html import format_html
@@ -74,7 +74,6 @@ def gen_table(context, object_list, template_name=None):
         RequestConfig(request, paginate=False).configure(table)
 
     # Render using the table's configured template
-    from django.template import engines
     django_engine = engines['django']
     template = django_engine.from_string('{% load django_tables2 %}{% render_table table %}')
     return template.render({'table': table, 'request': request})