Move imports to the top level

Author: Xpirix

qgis-app/plugins/tests/test_plugin_create_empty.py

@@ -5,12 +5,13 @@
 import os
 from unittest.mock import patch
 
-from django.contrib.auth.models import User
+from django.contrib.auth.models import User, Permission
+from django.contrib.contenttypes.models import ContentType
 from django.core.files.uploadedfile import SimpleUploadedFile
 from django.test import Client, TestCase, override_settings
 from django.urls import reverse
 from plugins.forms import PluginCreateForm
-from plugins.models import Plugin, PluginVersion
+from plugins.models import Plugin
 
 
 def do_nothing(*args, **kwargs):
@@ -345,11 +346,8 @@ def test_version_create_auto_approved_for_trusted_user(self):
         A user with can_approve permission should have their uploaded version
         approved automatically via the version_create view.
         """
-        from django.contrib.auth.models import Permission
-        from django.contrib.contenttypes.models import ContentType
-        from plugins.models import Plugin as PluginModel
 
-        ct = ContentType.objects.get_for_model(PluginModel)
+        ct = ContentType.objects.get_for_model(Plugin)
         perm = Permission.objects.get(codename="can_approve", content_type=ct)
         self.user.user_permissions.add(perm)
         # Refresh to bust Django's permission cache

qgis-app/plugins/tests/test_plugin_upload.py

@@ -3,7 +3,8 @@
 
 from django.urls import reverse
 from django.test import Client, TestCase, override_settings
-from django.contrib.auth.models import User
+from django.contrib.auth.models import User, Permission
+from django.contrib.contenttypes.models import ContentType
 from django.core.files.uploadedfile import SimpleUploadedFile
 from plugins.models import Plugin, PluginVersion
 from plugins.forms import PackageUploadForm
@@ -135,11 +136,7 @@ def test_new_version_auto_approved_for_trusted_user(self):
         A user with can_approve permission should have their uploaded version
         approved automatically via the plugin_upload view.
         """
-        from django.contrib.auth.models import Permission
-        from django.contrib.contenttypes.models import ContentType
-        from plugins.models import Plugin as PluginModel
-
-        ct = ContentType.objects.get_for_model(PluginModel)
+        ct = ContentType.objects.get_for_model(Plugin)
         perm = Permission.objects.get(codename="can_approve", content_type=ct)
         self.user.user_permissions.add(perm)
         # Refresh to bust Django's permission cache

qgis-app/plugins/tests/test_token_auth.py

@@ -1,15 +1,16 @@
 import os
 from unittest.mock import patch
 
-from django.contrib.auth.models import User
+from django.contrib.auth.models import User, Permission
+from django.contrib.contenttypes.models import ContentType
 from django.core.files.uploadedfile import SimpleUploadedFile
 from django.test import Client, TestCase, override_settings
 from django.urls import reverse
-from plugins.forms import PackageUploadForm
-from plugins.models import Plugin, PluginVersion
 from rest_framework_simplejwt.token_blacklist.models import OutstandingToken
 from rest_framework_simplejwt.tokens import RefreshToken
 
+from plugins.models import Plugin, PluginVersion
+
 
 def do_nothing(*args, **kwargs):
     pass
@@ -286,12 +287,8 @@ def test_new_version_auto_approved_for_trusted_token_user(self):
         A token whose owner holds can_approve should result in an approved version,
         regardless of whether request.user is AnonymousUser (token path).
         """
-        from django.contrib.auth.models import Permission
-        from django.contrib.contenttypes.models import ContentType
-        from plugins.models import Plugin as PluginModel
-
         # Grant can_approve to the token user
-        ct = ContentType.objects.get_for_model(PluginModel)
+        ct = ContentType.objects.get_for_model(Plugin)
         perm = Permission.objects.get(codename="can_approve", content_type=ct)
         self.user.user_permissions.add(perm)
         # Refresh to bust the permission cache