[#13] apply flake8 changes

maykinmedia · Sep 17, 2024 · 85487eb · 85487eb
1 parent 259119b
commit 85487eb
Show file tree

Hide file tree

Showing 13 changed files with 60 additions and 20 deletions.
diff --git a/src/objecttypes/conf/dev.py b/src/objecttypes/conf/dev.py
@@ -1,5 +1,4 @@
 import os
-import sys
 import warnings
 
 os.environ.setdefault("DEBUG", "yes")

diff --git a/src/objecttypes/tests/test_objecttype_admin.py b/src/objecttypes/tests/test_objecttype_admin.py
@@ -21,7 +21,10 @@
     "$schema": "http://json-schema.org/draft-07/schema#",
     "type": "object",
     "title": "Tree",
-    "description": "A woody plant (deciduous or coniferous) with a root system and a single, sturdy, woody stem, branching above the ground.",
+    "description": (
+        "A woody plant (deciduous or coniferous) with a root system and a "
+        "single, sturdy, woody stem, branching above the ground."
+    ),
     "required": ["diameter"],
     "properties": {"diameter": {"type": "integer", "description": "size in cm."}},
 }

diff --git a/src/objecttypes/tests/test_widgets.py b/src/objecttypes/tests/test_widgets.py
@@ -1,5 +1,3 @@
-import json
-
 from django.test import TestCase
 
 from bs4 import BeautifulSoup

diff --git a/src/objecttypes/tests/v1/test_auth.py b/src/objecttypes/tests/v1/test_auth.py
@@ -25,7 +25,7 @@ def test_invalid_token(self):
         TokenAuth.objects.create(contact_person="John Smith", email="[email protected]")
         for url in self.urls:
             with self.subTest(url=url):
-                response = self.client.get(url, HTTP_AUTHORIZATION=f"Token 12345")
+                response = self.client.get(url, HTTP_AUTHORIZATION="Token 12345")
                 self.assertEqual(response.status_code, status.HTTP_401_UNAUTHORIZED)
 
     def test_valid_token(self):

diff --git a/src/objecttypes/tests/v1/test_filters.py b/src/objecttypes/tests/v1/test_filters.py
@@ -15,9 +15,7 @@ def test_filter_public_data(self):
         object_type_1 = ObjectTypeFactory.create(
             data_classification=DataClassificationChoices.open
         )
-        object_type_2 = ObjectTypeFactory.create(
-            data_classification=DataClassificationChoices.intern
-        )
+        ObjectTypeFactory.create(data_classification=DataClassificationChoices.intern)
 
         response = self.client.get(
             self.url, {"dataClassification": DataClassificationChoices.open}

diff --git a/src/objecttypes/tests/v1/test_objecttype_api.py b/src/objecttypes/tests/v1/test_objecttype_api.py
@@ -44,7 +44,12 @@ def test_get_objecttypes(self):
                 "modifiedAt": "2020-01-01",
                 "allowGeometry": object_type.allow_geometry,
                 "versions": [
-                    f"http://testserver{reverse('objectversion-detail', args=[object_type.uuid, object_version.version])}"
+                    "http://testserver{url}".format(
+                        url=reverse(
+                            "objectversion-detail",
+                            args=[object_type.uuid, object_version.version],
+                        )
+                    )
                 ],
             },
         )
@@ -68,7 +73,12 @@ def test_get_objecttypes_with_versions(self):
                 self.assertEqual(
                     data["versions"],
                     [
-                        f"http://testserver{reverse('objectversion-detail', args=[object_type.uuid, object_versions[i].version])}"
+                        "http://testserver{url}".format(
+                            url=reverse(
+                                "objectversion-detail",
+                                args=[object_type.uuid, object_versions[i].version],
+                            )
+                        )
                     ],
                 )
 

diff --git a/src/objecttypes/tests/v1/test_objectversion_api.py b/src/objecttypes/tests/v1/test_objectversion_api.py
@@ -34,9 +34,18 @@ def test_get_versions(self):
             response.json(),
             [
                 {
-                    "url": f"http://testserver{reverse('objectversion-detail', args=[object_type.uuid, object_version.version])}",
+                    "url": "http://testserver{url}".format(
+                        url=reverse(
+                            "objectversion-detail",
+                            args=[object_type.uuid, object_version.version],
+                        )
+                    ),
                     "version": object_version.version,
-                    "objectType": f"http://testserver{reverse('objecttype-detail', args=[object_version.object_type.uuid])}",
+                    "objectType": "http://testserver{url}".format(
+                        url=reverse(
+                            "objecttype-detail", args=[object_version.object_type.uuid]
+                        )
+                    ),
                     "status": object_version.status,
                     "createdAt": "2020-01-01",
                     "modifiedAt": "2020-01-01",

diff --git a/src/objecttypes/tests/v2/test_auth.py b/src/objecttypes/tests/v2/test_auth.py
@@ -25,7 +25,7 @@ def test_invalid_token(self):
         TokenAuth.objects.create(contact_person="John Smith", email="[email protected]")
         for url in self.urls:
             with self.subTest(url=url):
-                response = self.client.get(url, HTTP_AUTHORIZATION=f"Token 12345")
+                response = self.client.get(url, HTTP_AUTHORIZATION="Token 12345")
                 self.assertEqual(response.status_code, status.HTTP_401_UNAUTHORIZED)
 
     def test_valid_token(self):

diff --git a/src/objecttypes/tests/v2/test_filters.py b/src/objecttypes/tests/v2/test_filters.py
@@ -15,7 +15,7 @@ def test_filter_public_data(self):
         object_type_1 = ObjectTypeFactory.create(
             data_classification=DataClassificationChoices.open
         )
-        object_type_2 = ObjectTypeFactory.create(
+        ObjectTypeFactory.create(
             data_classification=DataClassificationChoices.intern
         )
 

diff --git a/src/objecttypes/tests/v2/test_objecttype_api.py b/src/objecttypes/tests/v2/test_objecttype_api.py
@@ -44,7 +44,12 @@ def test_get_objecttypes(self):
                 "modifiedAt": "2020-01-01",
                 "allowGeometry": object_type.allow_geometry,
                 "versions": [
-                    f"http://testserver{reverse('objectversion-detail', args=[object_type.uuid, object_version.version])}"
+                    "http://testserver{url}".format(
+                        url=reverse(
+                            "objectversion-detail",
+                            args=[object_type.uuid, object_version.version],
+                        )
+                    ),
                 ],
             },
         )
@@ -68,7 +73,12 @@ def test_get_objecttypes_with_versions(self):
                 self.assertEqual(
                     data["versions"],
                     [
-                        f"http://testserver{reverse('objectversion-detail', args=[object_type.uuid, object_versions[i].version])}"
+                        "http://testserver{url}".format(
+                            url=reverse(
+                                "objectversion-detail",
+                                args=[object_type.uuid, object_versions[i].version],
+                            )
+                        ),
                     ],
                 )
 

diff --git a/src/objecttypes/tests/v2/test_objectversion_api.py b/src/objecttypes/tests/v2/test_objectversion_api.py
@@ -38,9 +38,19 @@ def test_get_versions(self):
                 "previous": None,
                 "results": [
                     {
-                        "url": f"http://testserver{reverse('objectversion-detail', args=[object_type.uuid, object_version.version])}",
+                        "url": "http://testserver{url}".format(
+                            url=reverse(
+                                "objectversion-detail",
+                                args=[object_type.uuid, object_version.version],
+                            ),
+                        ),
                         "version": object_version.version,
-                        "objectType": f"http://testserver{reverse('objecttype-detail', args=[object_version.object_type.uuid])}",
+                        "objectType": "http://testserver{url}".format(
+                            url=reverse(
+                                "objecttype-detail",
+                                args=[object_version.object_type.uuid],
+                            )
+                        ),
                         "status": object_version.status,
                         "createdAt": "2020-01-01",
                         "modifiedAt": "2020-01-01",

diff --git a/src/objecttypes/utils/oas_extensions/__init__.py b/src/objecttypes/utils/oas_extensions/__init__.py
@@ -1,2 +1,7 @@
 from .fields import HyperlinkedIdentityFieldExtension
 from .query import DjangoFilterExtension
+
+__all__ = [
+    "HyperlinkedIdentityFieldExtension",
+    "DjangoFilterExtension"
+]
diff --git a/src/objecttypes/wsgi.py b/src/objecttypes/wsgi.py
@@ -7,8 +7,6 @@
 https://docs.djangoproject.com/en/3.0/howto/deployment/wsgi/
 """
 
-import os
-
 from django.core.wsgi import get_wsgi_application
 
 from objecttypes.setup import setup_env