[qa] Formatted code

Author: pandafy

openwisp_users/multitenancy.py

@@ -66,7 +66,7 @@ def _has_org_permission(self, request, obj, perm_func):
         associated with specific organizations.
         """
         perm = perm_func(request, obj)
-        if not request.user.is_superuser and obj and hasattr(obj, 'organization_id'):
+        if not request.user.is_superuser and obj and hasattr(obj, "organization_id"):
             perm = perm and (
                 obj.organization_id
                 and str(obj.organization_id) in request.user.organizations_managed
@@ -179,7 +179,7 @@ class MultitenantOrgFilter(AutocompleteFilter):
     title = _("organization")
     widget_attrs = AutocompleteFilter.widget_attrs.copy()
     widget_attrs.update(
-        {"data-empty-label": SHARED_SYSTEMWIDE_LABEL, 'data-is-filter': 'true'}
+        {"data-empty-label": SHARED_SYSTEMWIDE_LABEL, "data-is-filter": "true"}
     )
 
 

openwisp_users/tests/test_api/__init__.py

@@ -25,64 +25,64 @@ def _test_access_shared_object(
         expected_count=0,
         expected_status_codes=None,
     ):
-        auth = dict(HTTP_AUTHORIZATION=f'Bearer {token}')
+        auth = dict(HTTP_AUTHORIZATION=f"Bearer {token}")
         create_payload = create_payload or {}
         update_payload = update_payload or {}
         expected_status_codes = expected_status_codes or {}
 
         if listview_name or listview_path:
             listview_path = listview_path or reverse(listview_name)
-            with self.subTest('HEAD and OPTION methods'):
+            with self.subTest("HEAD and OPTION methods"):
                 response = self.client.head(listview_path, **auth)
-                self.assertEqual(response.status_code, expected_status_codes['head'])
+                self.assertEqual(response.status_code, expected_status_codes["head"])
 
                 response = self.client.options(listview_path, **auth)
-                self.assertEqual(response.status_code, expected_status_codes['option'])
+                self.assertEqual(response.status_code, expected_status_codes["option"])
 
-            with self.subTest('Create shared object'):
+            with self.subTest("Create shared object"):
                 response = self.client.post(
                     listview_path,
                     data=create_payload,
-                    content_type='application/json',
+                    content_type="application/json",
                     **auth,
                 )
-                self.assertEqual(response.status_code, expected_status_codes['create'])
-                if expected_status_codes['create'] == 400:
+                self.assertEqual(response.status_code, expected_status_codes["create"])
+                if expected_status_codes["create"] == 400:
                     self.assertEqual(
-                        str(response.data['organization'][0]),
-                        'This field may not be null.',
+                        str(response.data["organization"][0]),
+                        "This field may not be null.",
                     )
 
-            with self.subTest('List all shared objects'):
+            with self.subTest("List all shared objects"):
                 response = self.client.get(listview_path, **auth)
-                self.assertEqual(response.status_code, expected_status_codes['list'])
+                self.assertEqual(response.status_code, expected_status_codes["list"])
                 data = response.data
                 if not isinstance(response.data, list):
-                    data = data.get('results', data)
+                    data = data.get("results", data)
                 self.assertEqual(len(data), expected_count)
 
         if detailview_name or detailview_path:
             if not detailview_path and listview_name and expected_count > 0:
-                detailview_path = reverse(detailview_name, args=[data[0]['id']])
+                detailview_path = reverse(detailview_name, args=[data[0]["id"]])
 
-            with self.subTest('Retrieve shared object'):
+            with self.subTest("Retrieve shared object"):
                 response = self.client.get(detailview_path, **auth)
                 self.assertEqual(
-                    response.status_code, expected_status_codes['retrieve']
+                    response.status_code, expected_status_codes["retrieve"]
                 )
 
-            with self.subTest('Update shared object'):
+            with self.subTest("Update shared object"):
                 response = self.client.put(
                     detailview_path,
                     data=update_payload,
-                    content_type='application/json',
+                    content_type="application/json",
                     **auth,
                 )
-                self.assertEqual(response.status_code, expected_status_codes['update'])
+                self.assertEqual(response.status_code, expected_status_codes["update"])
 
-            with self.subTest('Delete shared object'):
+            with self.subTest("Delete shared object"):
                 response = self.client.delete(detailview_path, **auth)
-                self.assertEqual(response.status_code, expected_status_codes['delete'])
+                self.assertEqual(response.status_code, expected_status_codes["delete"])
 
     def _test_org_user_access_shared_object(
         self,
@@ -102,16 +102,16 @@ def _test_org_user_access_shared_object(
         """
         if not token:
             user = self._create_administrator(organizations=[self._get_org()])
-            token = self._obtain_auth_token(user.username, 'tester')
+            token = self._obtain_auth_token(user.username, "tester")
         if not expected_status_codes:
             expected_status_codes = {
-                'create': 400,
-                'list': 200,
-                'retrieve': 200,
-                'update': 403,
-                'delete': 403,
-                'head': 200,
-                'option': 200,
+                "create": 400,
+                "list": 200,
+                "retrieve": 200,
+                "update": 403,
+                "delete": 403,
+                "head": 200,
+                "option": 200,
             }
         self._test_access_shared_object(
             token=token,
@@ -142,16 +142,16 @@ def _test_superuser_access_shared_object(
         """
         if not token:
             user = self._create_admin()
-            token = self._obtain_auth_token(user.username, 'tester')
+            token = self._obtain_auth_token(user.username, "tester")
         if not expected_status_codes:
             expected_status_codes = {
-                'create': 201,
-                'list': 200,
-                'retrieve': 200,
-                'update': 200,
-                'delete': 204,
-                'head': 200,
-                'option': 200,
+                "create": 201,
+                "list": 200,
+                "retrieve": 200,
+                "update": 200,
+                "delete": 204,
+                "head": 200,
+                "option": 200,
             }
         self._test_access_shared_object(
             token=token,

openwisp_users/tests/utils.py

@@ -8,10 +8,10 @@
 
 from openwisp_users.multitenancy import SHARED_SYSTEMWIDE_LABEL
 
-Organization = load_model('openwisp_users', 'Organization')
-OrganizationOwner = load_model('openwisp_users', 'OrganizationOwner')
-OrganizationUser = load_model('openwisp_users', 'OrganizationUser')
-Group = load_model('openwisp_users', 'Group')
+Organization = load_model("openwisp_users", "Organization")
+OrganizationOwner = load_model("openwisp_users", "OrganizationOwner")
+OrganizationUser = load_model("openwisp_users", "OrganizationUser")
+Group = load_model("openwisp_users", "Group")
 User = get_user_model()
 
 
@@ -264,8 +264,8 @@ def _test_org_admin_create_shareable_object(
             error_message = error_message or (
                 '<div class="form-row errors field-organization">\n'
                 '            <ul class="errorlist"{}>'
-                '<li>This field is required.</li></ul>'
-            ).format(' id="id_organization_error"' if django.VERSION >= (5, 2) else '')
+                "<li>This field is required.</li></ul>"
+            ).format(' id="id_organization_error"' if django.VERSION >= (5, 2) else "")
             self.assertContains(response, error_message)
         self.assertEqual(model.objects.count(), expected_count)
 
@@ -284,9 +284,9 @@ def _test_org_admin_view_shareable_object(
             expected_element = (
                 '<div class="form-row field-organization">\n\n\n<div>\n\n'
                 '<div class="flex-container">\n\n'
-                '<label>Organization:</label>\n\n'
+                "<label>Organization:</label>\n\n"
                 '<div class="readonly">-</div>\n\n\n'
-                '</div>\n\n</div>\n\n\n</div>'
+                "</div>\n\n</div>\n\n\n</div>"
             )
         self.assertContains(response, expected_element, html=True)
 
@@ -296,21 +296,21 @@ def _test_object_organization_fk_autocomplete_view(
     ):
         app_label = model._meta.app_label
         model_name = model._meta.model_name
-        path = self._get_autocomplete_view_path(app_label, model_name, 'organization')
+        path = self._get_autocomplete_view_path(app_label, model_name, "organization")
         org = self._get_org()
         admin = User.objects.filter(is_superuser=True).first()
         if not admin:
             admin = self._create_admin()
         org_admin = self._create_administrator(organizations=[org])
 
-        with self.subTest('Org admin should only see their own org'):
+        with self.subTest("Org admin should only see their own org"):
             self.client.force_login(org_admin)
             response = self.client.get(path)
             self.assertEqual(response.status_code, 200)
             self.assertContains(response, org.name)
             self.assertNotContains(response, SHARED_SYSTEMWIDE_LABEL)
 
-        with self.subTest('Superuser should see all orgs and shared label'):
+        with self.subTest("Superuser should see all orgs and shared label"):
             self.client.force_login(admin)
             response = self.client.get(path)
             self.assertEqual(response.status_code, 200)
@@ -320,9 +320,9 @@ def _test_object_organization_fk_autocomplete_view(
     def _get_autocomplete_view_path(
         self, app_label, model_name, field_name, is_filter=False
     ):
-        path = reverse('admin:ow-auto-filter')
+        path = reverse("admin:ow-auto-filter")
         return (
-            f'{path}?app_label={app_label}'
-            f'&model_name={model_name}&field_name={field_name}'
-            '{}'.format('&is_filter=true' if is_filter else '')
+            f"{path}?app_label={app_label}"
+            f"&model_name={model_name}&field_name={field_name}"
+            "{}".format("&is_filter=true" if is_filter else "")
         )

openwisp_users/views.py

@@ -43,5 +43,5 @@ def get_empty_label(self):
 
     def get_allow_null(self):
         if self.object_list.model == Organization:
-            return self.request.user.is_superuser or self.request.GET.get('is_filter')
+            return self.request.user.is_superuser or self.request.GET.get("is_filter")
         return super().get_allow_null()

tests/testapp/tests/test_admin.py

@@ -46,10 +46,10 @@ def test_accounts_login(self):
 
 class TestTemplateAdmin(TestMultitenantAdminMixin, TestCase):
     def _create_template(self, **kwargs):
-        if 'organization' not in kwargs:
-            kwargs['organization'] = self._get_org()
+        if "organization" not in kwargs:
+            kwargs["organization"] = self._get_org()
         options = {
-            'name': 'test-template',
+            "name": "test-template",
         }
         options.update(kwargs)
         template = Template(**options)
@@ -59,10 +59,10 @@ def _create_template(self, **kwargs):
 
     def test_org_admin_create_shareable_template(self):
         self._test_org_admin_create_shareable_object(
-            reverse('admin:testapp_template_add'),
+            reverse("admin:testapp_template_add"),
             payload={
-                'name': 'test-template',
-                'organization': '',
+                "name": "test-template",
+                "organization": "",
             },
             model=Template,
         )
@@ -75,7 +75,7 @@ def test_template_organization_autocomplete_view(self):
     def test_org_admin_view_shared_template(self):
         template = self._create_template(organization=None)
         self._test_org_admin_view_shareable_object(
-            reverse('admin:testapp_template_change', args=(template.id,)),
+            reverse("admin:testapp_template_change", args=(template.id,)),
         )
 
     def test_superuser_create_shareable_template(self):

tests/testapp/tests/test_permission_classes.py

@@ -234,20 +234,20 @@ def test_view_django_model_permission_with_change_perm(self):
     def test_superuser_access_shared_object(self):
         self._test_superuser_access_shared_object(
             token=None,
-            listview_name='test_template_list',
-            detailview_name='test_template_detail',
-            create_payload={'name': 'test', 'organization': ''},
-            update_payload={'name': 'updated-test'},
+            listview_name="test_template_list",
+            detailview_name="test_template_detail",
+            create_payload={"name": "test", "organization": ""},
+            update_payload={"name": "updated-test"},
             expected_count=1,
         )
 
     def test_org_manager_access_shared_object(self):
         template = self._create_template(organization=None)
         self._test_org_user_access_shared_object(
-            listview_path=reverse('test_template_list'),
-            detailview_path=reverse('test_template_detail', args=[template.pk]),
-            create_payload={'name': 'test', 'organization': ''},
-            update_payload={'name': 'updated-test'},
+            listview_path=reverse("test_template_list"),
+            detailview_path=reverse("test_template_detail", args=[template.pk]),
+            create_payload={"name": "test", "organization": ""},
+            update_payload={"name": "updated-test"},
             expected_count=1,
         )
 
@@ -258,10 +258,10 @@ def test_org_owner_access_shared_object(self):
         token = self._obtain_auth_token(username=org_owner)
         template = self._create_template(organization=None)
         self._test_org_user_access_shared_object(
-            listview_path=reverse('test_template_list'),
-            detailview_path=reverse('test_template_detail', args=[template.pk]),
-            create_payload={'name': 'test', 'organization': ''},
-            update_payload={'name': 'updated-test'},
+            listview_path=reverse("test_template_list"),
+            detailview_path=reverse("test_template_detail", args=[template.pk]),
+            create_payload={"name": "test", "organization": ""},
+            update_payload={"name": "updated-test"},
             expected_count=1,
             token=token,
         )
@@ -275,10 +275,10 @@ def test_org_user_access_shared_object(self):
         self._create_org_user(user=user, is_admin=False)
         template = self._create_template(organization=None)
         self._test_org_user_access_shared_object(
-            listview_path=reverse('test_template_list'),
-            detailview_path=reverse('test_template_detail', args=[template.pk]),
-            create_payload={'name': 'test', 'organization': ''},
-            update_payload={'name': 'updated-test'},
+            listview_path=reverse("test_template_list"),
+            detailview_path=reverse("test_template_detail", args=[template.pk]),
+            create_payload={"name": "test", "organization": ""},
+            update_payload={"name": "updated-test"},
             expected_count=0,
             token=token,
             expected_status_codes={

tests/testapp/tests/test_selenium.py

@@ -153,24 +153,24 @@ def test_organization_autocomplete_filter(self):
         The autocomplete_filter should show option to filter
         shared objects to non-superuser.
         """
-        path = reverse('admin:testapp_shelf_changelist')
-        org1 = self._create_org(name='org1')
+        path = reverse("admin:testapp_shelf_changelist")
+        org1 = self._create_org(name="org1")
         administrator = self._create_administrator(
-            organizations=[org1], username='tester', password='tester'
+            organizations=[org1], username="tester", password="tester"
         )
         administrator.user_permissions.add(
             *Permission.objects.filter(
-                Q(codename__contains='shelf') | Q(codename='view_organization')
-            ).values_list('id', flat=True),
+                Q(codename__contains="shelf") | Q(codename="view_organization")
+            ).values_list("id", flat=True),
         )
         self._test_multitenant_autocomplete_org_field(
             path=path,
-            username='tester',
-            password='tester',
-            visible=[org1.name, 'Shared systemwide (no organization)'],
+            username="tester",
+            password="tester",
+            visible=[org1.name, "Shared systemwide (no organization)"],
             hidden=list(
-                Organization.objects.exclude(id=org1.id).values_list('name', flat=True)
+                Organization.objects.exclude(id=org1.id).values_list("name", flat=True)
             ),
-            select2_selector='#select2-id-organization-dal-filter-container',
+            select2_selector="#select2-id-organization-dal-filter-container",
         )
         self.logout()