Reformatting for latest Black (GeoNode#11915)

Author: giohappy

create-envfile.py

@@ -92,9 +92,7 @@ def _get_vals_to_replace(args):
         _vals_to_replace["letsencrypt_mode"] = (
             "disabled"
             if not _vals_to_replace.get("https_host")
-            else "staging"
-            if _jsfile.get("env_type", args.env_type) in ["test"]
-            else "production"
+            else "staging" if _jsfile.get("env_type", args.env_type) in ["test"] else "production"
         )
         _vals_to_replace["debug"] = False if _jsfile.get("env_type", args.env_type) in ["prod", "test"] else True
         _vals_to_replace["email"] = _jsfile.get("email", args.email)
@@ -124,7 +122,7 @@ def _get_vals_to_replace(args):
         prog="ENV file builder",
         description="Tool for generate environment file automatically. The information can be passed or via CLI or via JSON file ( --file /path/env.json)",
         usage="python create-envfile.py localhost -f /path/to/json/file.json",
-        allow_abbrev=False
+        allow_abbrev=False,
     )
     parser.add_argument(
         "--noinput",

geonode/api/resourcebase_api.py

@@ -593,7 +593,6 @@ def hydrate_title(self, bundle):
 
 
 class ResourceBaseResource(CommonModelApi):
-
     """ResourceBase api"""
 
     class Meta(CommonMetaApi):
@@ -607,7 +606,6 @@ class Meta(CommonMetaApi):
 
 
 class FeaturedResourceBaseResource(CommonModelApi):
-
     """Only the featured resourcebases"""
 
     class Meta(CommonMetaApi):
@@ -620,7 +618,6 @@ class Meta(CommonMetaApi):
 
 
 class LayerResource(CommonModelApi):
-
     """Dataset API"""
 
     links = fields.ListField(attribute="links", null=True, use_in="all", default=[])
@@ -756,7 +753,6 @@ class Meta(CommonMetaApi):
 
 
 class MapResource(CommonModelApi):
-
     """Maps API"""
 
     def build_filters(self, filters=None, ignore_bad_filters=False, **kwargs):
@@ -822,7 +818,6 @@ class Meta(CommonMetaApi):
 
 
 class GeoAppResource(CommonModelApi):
-
     """GeoApps API"""
 
     def format_objects(self, objects):
@@ -874,7 +869,6 @@ class Meta(CommonMetaApi):
 
 
 class DocumentResource(CommonModelApi):
-
     """Documents API"""
 
     def build_filters(self, filters=None, ignore_bad_filters=False, **kwargs):

geonode/api/tests.py

@@ -386,7 +386,6 @@ def test_tags_lockdown(self):
 
 
 class SearchApiTests(ResourceTestCaseMixin, GeoNodeBaseTestSupport):
-
     """Test the search"""
 
     #  loading test thesausuri and initial data

geonode/base/api/permissions.py

@@ -41,7 +41,6 @@
 
 
 class IsSelf(permissions.BasePermission):
-
     """Grant permission only if the current instance is the request user.
     Used to allow users to edit their own account, nothing to others (even
     superusers).
@@ -62,7 +61,6 @@ def has_object_permission(self, request, view, obj):
 
 
 class IsSelfOrReadOnly(IsSelf):
-
     """Grant permissions if instance *IS* the request user, or read-only.
     Used to allow users to edit their own account, and others to read.
     """
@@ -75,7 +73,6 @@ def has_object_permission(self, request, view, obj):
 
 
 class IsSelfOrAdmin(IsSelf):
-
     """Grant R/W to self and superusers/staff members. Deny others."""
 
     def has_permission(self, request, view):
@@ -94,7 +91,6 @@ def has_object_permission(self, request, view, obj):
 
 
 class IsSelfOrAdminOrReadOnly(IsSelfOrAdmin):
-
     """Grant R/W to self and superusers/staff members, R/O to others."""
 
     def has_permission(self, request, view):
@@ -111,7 +107,6 @@ def has_object_permission(self, request, view, obj):
 
 
 class IsSelfOrAdminOrAuthenticatedReadOnly(IsSelfOrAdmin):
-
     """Grant R/W to self and superusers/staff members, R/O to auth."""
 
     def has_object_permission(self, request, view, obj):

geonode/base/api/serializers.py

@@ -655,7 +655,7 @@ class Meta:
             "is_copyable",
             "blob",
             "metadata",
-            "executions"
+            "executions",
             # TODO
             # csw_typename, csw_schema, csw_mdsource, csw_insert_date, csw_type, csw_anytext, csw_wkt_geometry,
             # metadata_uploaded, metadata_uploaded_preserve, metadata_xml,

geonode/base/api/tests.py

@@ -1951,10 +1951,10 @@ def test_set_resource_thumbnail(self):
         self.assertEqual(response.json(), "The url must be of an image with format (png, jpeg or jpg)")
 
         # using Base64 data as an ASCII byte string
-        data[
-            "file"
-        ] = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAABHNCSVQICAgI\
+        data["file"] = (
+            "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAABHNCSVQICAgI\
         fAhkiAAAABl0RVh0U29mdHdhcmUAZ25vbWUtc2NyZWVuc2hvdO8Dvz4AAAANSURBVAiZYzAxMfkPAALYAZzx61+bAAAAAElFTkSuQmCC"
+        )
         with patch("geonode.base.models.is_monochromatic_image") as _mck:
             _mck.return_value = False
             response = self.client.put(url, data=data, format="json")

geonode/base/forms.py

@@ -412,7 +412,6 @@ def build_attrs(self, base_attrs=None, extra_attrs=None, **kwargs):
 
 
 class ResourceBaseForm(TranslationModelForm, LinkedResourceForm):
-
     """Base form for metadata, should be inherited by childres classes of ResourceBase"""
 
     abstract = forms.CharField(label=_("Abstract"), required=False, widget=TinyMCE())

geonode/base/tests.py

@@ -166,7 +166,6 @@ def test_add_missing_metadata_author_or_poc(self):
 
 
 class TestCreationOfContactRolesByDifferentInputTypes(ThumbnailTests):
-
     """
     Test that contact roles can be set as people profile
     """

geonode/catalogue/metadataxsl/tests.py

@@ -25,7 +25,6 @@
 
 
 class MetadataXSLTest(GeoNodeBaseTestSupport):
-
     """
     Tests geonode.catalogue.metadataxsl app/module
     """

geonode/context_processors.py

@@ -86,15 +86,17 @@ def resource_urls(request):
         EXIF_ENABLED=getattr(settings, "EXIF_ENABLED", False),
         FAVORITE_ENABLED=getattr(settings, "FAVORITE_ENABLED", False),
         SEARCH_FILTERS=getattr(settings, "SEARCH_FILTERS", False),
-        THESAURI_FILTERS=[
-            t["name"]
-            for t in [
-                settings.THESAURUS,
+        THESAURI_FILTERS=(
+            [
+                t["name"]
+                for t in [
+                    settings.THESAURUS,
+                ]
+                if t.get("filter")
             ]
-            if t.get("filter")
-        ]
-        if hasattr(settings, "THESAURUS")
-        else [t.identifier for t in thesaurus],
+            if hasattr(settings, "THESAURUS")
+            else [t.identifier for t in thesaurus]
+        ),
         MAP_CLIENT_USE_CROSS_ORIGIN_CREDENTIALS=getattr(settings, "MAP_CLIENT_USE_CROSS_ORIGIN_CREDENTIALS", False),
         SHOW_PROFILE_EMAIL=getattr(settings, "SHOW_PROFILE_EMAIL", False),
         OGC_SERVER=getattr(settings, "OGC_SERVER", None),

geonode/documents/forms.py

@@ -117,7 +117,6 @@ class DocumentDescriptionForm(forms.Form):
 
 
 class DocumentCreateForm(TranslationModelForm):
-
     """
     The document upload form.
     """

geonode/documents/models.py

@@ -37,7 +37,6 @@
 
 
 class Document(ResourceBase):
-
     """
     A document is any kind of information that can be attached to a map such as pdf, images, videos, xls...
     """

geonode/documents/views.py

@@ -322,9 +322,11 @@ def document_metadata(
         category_form = CategoryForm(
             request.POST,
             prefix="category_choice_field",
-            initial=int(request.POST["category_choice_field"])
-            if "category_choice_field" in request.POST and request.POST["category_choice_field"]
-            else None,
+            initial=(
+                int(request.POST["category_choice_field"])
+                if "category_choice_field" in request.POST and request.POST["category_choice_field"]
+                else None
+            ),
         )
 
         if hasattr(settings, "THESAURUS"):

geonode/geoapps/models.py

@@ -31,7 +31,6 @@
 
 
 class GeoApp(ResourceBase):
-
     """
     A GeoApp it is a generic container for every client applications the
     user might want to create or define.

geonode/geoapps/tests.py

@@ -31,7 +31,6 @@
 
 
 class GeoAppTests(GeoNodeBaseTestSupport):
-
     """Tests geonode.geoapps module"""
 
     fixtures = ["initial_data.json", "group_test_data.json", "default_oauth_apps.json"]

geonode/geoapps/views.py

@@ -216,9 +216,11 @@ def geoapp_metadata(
         category_form = CategoryForm(
             request.POST,
             prefix="category_choice_field",
-            initial=int(request.POST["category_choice_field"])
-            if "category_choice_field" in request.POST and request.POST["category_choice_field"]
-            else None,
+            initial=(
+                int(request.POST["category_choice_field"])
+                if "category_choice_field" in request.POST and request.POST["category_choice_field"]
+                else None
+            ),
         )
 
         if hasattr(settings, "THESAURUS"):

geonode/geoserver/createlayer/tests.py

@@ -33,7 +33,6 @@
 
 
 class CreateLayerCoreTest(GeoNodeBaseTestSupport):
-
     """
     Test createlayer application.
     """

geonode/geoserver/tests/integration.py

@@ -56,7 +56,6 @@ def _log(msg, *args):
 
 @override_settings(SITEURL="http://localhost:8001/")
 class GeoNodeGeoServerSync(GeoNodeLiveTestSupport):
-
     """
     Tests GeoNode/GeoServer syncronization
     """
@@ -104,7 +103,6 @@ def test_set_attributes_from_geoserver(self):
 
 @override_settings(SITEURL="http://localhost:8002/")
 class GeoNodeGeoServerCapabilities(GeoNodeLiveTestSupport):
-
     """
     Tests GeoNode/GeoServer GetCapabilities per layer, user, category and map
     """

geonode/harvesting/harvesters/geonodeharvester.py

@@ -433,14 +433,14 @@ def _get_resource_list_params(self, offset: typing.Optional[int] = 0) -> typing.
             result["filter{title.icontains}"] = self.resource_title_filter
         if self.start_date_filter is not None:
             start_date = dateutil.parser.parse(self.start_date_filter)
-            result[
-                "filter{date.gte}"
-            ] = f"{start_date.astimezone(dt.timezone.utc).replace(microsecond=0).isoformat().split('+')[0]}Z"
+            result["filter{date.gte}"] = (
+                f"{start_date.astimezone(dt.timezone.utc).replace(microsecond=0).isoformat().split('+')[0]}Z"
+            )
         if self.end_date_filter is not None:
             end_date = dateutil.parser.parse(self.end_date_filter)
-            result[
-                "filter{date.lte}"
-            ] = f"{end_date.astimezone(dt.timezone.utc).replace(microsecond=0).isoformat().split('+')[0]}Z"
+            result["filter{date.lte}"] = (
+                f"{end_date.astimezone(dt.timezone.utc).replace(microsecond=0).isoformat().split('+')[0]}Z"
+            )
         if self.keywords_filter is not None:
             result["filter{keywords.slug.in}"] = self.keywords_filter
         if self.categories_filter is not None:
@@ -738,14 +738,14 @@ def _get_resource_list_params(self, offset: typing.Optional[int] = 0) -> typing.
             result["title__icontains"] = self.resource_title_filter
         if self.start_date_filter is not None:
             start_date = dateutil.parser.parse(self.start_date_filter)
-            result[
-                "date__gte"
-            ] = f"{start_date.astimezone(dt.timezone.utc).replace(microsecond=0).isoformat().split('+')[0]}Z"
+            result["date__gte"] = (
+                f"{start_date.astimezone(dt.timezone.utc).replace(microsecond=0).isoformat().split('+')[0]}Z"
+            )
         if self.end_date_filter is not None:
             end_date = dateutil.parser.parse(self.end_date_filter)
-            result[
-                "date__lte"
-            ] = f"{end_date.astimezone(dt.timezone.utc).replace(microsecond=0).isoformat().split('+')[0]}Z"
+            result["date__lte"] = (
+                f"{end_date.astimezone(dt.timezone.utc).replace(microsecond=0).isoformat().split('+')[0]}Z"
+            )
         if self.keywords_filter is not None:
             result["keywords__slug__in"] = ",".join(self.keywords_filter)
         if self.categories_filter is not None:

geonode/layers/models.py

@@ -61,7 +61,6 @@
 
 
 class Style(models.Model, PermissionLevelMixin):
-
     """Model for storing styles."""
 
     name = models.CharField(_("style name"), max_length=255, unique=True)
@@ -103,7 +102,6 @@ def __init__(self):
 
 
 class Dataset(ResourceBase):
-
     """
     Dataset (inherits ResourceBase fields)
     """
@@ -376,15 +374,13 @@ def view_count_up(self, user, do_local=False):
 
 
 class AttributeManager(models.Manager):
-
     """Helper class to access filtered attributes"""
 
     def visible(self):
         return self.get_queryset().filter(visible=True).order_by("display_order")
 
 
 class Attribute(models.Model):
-
     """
      Auxiliary model for storing layer attributes.
 

geonode/layers/tests.py

@@ -90,7 +90,6 @@
 
 
 class DatasetsTest(GeoNodeBaseTestSupport):
-
     """Tests geonode.layers app/module"""
 
     type = "dataset"

geonode/layers/views.py

@@ -414,9 +414,11 @@ def dataset_metadata(
         category_form = CategoryForm(
             request.POST,
             prefix="category_choice_field",
-            initial=int(request.POST["category_choice_field"])
-            if "category_choice_field" in request.POST and request.POST["category_choice_field"]
-            else None,
+            initial=(
+                int(request.POST["category_choice_field"])
+                if "category_choice_field" in request.POST and request.POST["category_choice_field"]
+                else None
+            ),
         )
         if not category_form.is_valid():
             logger.error(f"Dataset Category form is not valid: {category_form.errors}")

geonode/maps/models.py

@@ -37,7 +37,6 @@
 
 
 class Map(ResourceBase):
-
     """
     A Map aggregates several layers together and annotates them with a viewport
     configuration.
@@ -231,7 +230,6 @@ class Meta(ResourceBase.Meta):
 
 
 class MapLayer(models.Model):
-
     """
     The MapLayer model represents a layer included in a map.  This doesn't just
     identify the dataset, but also extra options such as which style to load

geonode/maps/tests.py

@@ -79,7 +79,6 @@
 
 
 class MapsTest(NotificationsTestsHelper):
-
     """Tests geonode.maps app/module"""
 
     fixtures = ["initial_data.json", "group_test_data.json", "default_oauth_apps.json"]