[Fixes #11494] Implement relations between resources - fix flake

geonode/base/api/tests.py

@@ -24,7 +24,6 @@
 import logging
 from typing import Iterable
 
-from django.contrib.contenttypes.models import ContentType
 from django.test import RequestFactory, override_settings
 import gisdata
 
@@ -2648,7 +2647,6 @@ def assert_linkedres_size(self, payload, element: str, expected_size: int):
         self.assertEqual(expected_size, len(payload[element]), f"Mismatching payload size of {element}")
 
     def assert_linkedres_contains(self, payload, element: str, expected_elements: Iterable):
-        # try:
         res_list = payload[element]
         for dikt in expected_elements:
             found = False
@@ -2657,14 +2655,11 @@ def assert_linkedres_contains(self, payload, element: str, expected_elements: It
                     if dikt.items() <= res.items():
                         found = True
                         break
-                except AttributeError as e:
+                except AttributeError:
                     self.fail(f"\nError while comparing \n EXPECTED: {dikt}\n FOUND: {res}")
 
             if not found:
                 self.fail(f"Elements {dikt} could not be found in output: {payload}")
-        # except Exception as e:
-        #     logger.exception(f"\nError while evaluating {payload}", e)
-        #     raise e
 
     def test_linked_resource_for_maps_mixed(self):
         try:

geonode/base/api/views.py

@@ -17,7 +17,6 @@
 #
 #########################################################################
 import ast
-from geonode.geoapps.models import GeoApp
 import json
 import re
 
@@ -61,7 +60,7 @@
 from geonode.maps.models import Map
 from geonode.layers.models import Dataset
 from geonode.favorite.models import Favorite
-from geonode.base.models import Configuration, ExtraMetadata, LinkedResource
+from geonode.base.models import Configuration, ExtraMetadata
 from geonode.thumbs.exceptions import ThumbnailError
 from geonode.thumbs.thumbnails import create_thumbnail
 from geonode.thumbs.utils import _decode_base64, BASE64_PATTERN

geonode/documents/models.py

@@ -25,14 +25,9 @@
 from django.urls import reverse
 from django.utils.functional import classproperty
 from django.utils.translation import ugettext_lazy as _
-from django.contrib.contenttypes.models import ContentType
-from django.contrib.contenttypes.fields import GenericForeignKey
 
 from geonode.client.hooks import hookset
-from geonode.maps.models import Map
-from geonode.layers.models import Dataset
 from geonode.base.models import ResourceBase
-from geonode.maps.signals import map_changed_signal
 from geonode.groups.conf import settings as groups_settings
 from geonode.documents.enumerations import DOCUMENT_TYPE_MAP, DOCUMENT_MIMETYPE_MAP
 from geonode.security.permissions import VIEW_PERMISSIONS, OWNER_PERMISSIONS, DOWNLOAD_PERMISSIONS

geonode/layers/models.py

@@ -322,8 +322,6 @@ def get_linked_resources(self, as_target: bool = False):
         ret = super().get_linked_resources(as_target)
 
         if as_target:
-            from geonode.maps.models import Map
-
             # create LinkedResources on the fly to report MapLayer relationship
             res = (LinkedResource(source=map, target=self, internal=True) for map in self.maps)
             ret = itertools.chain(ret, res)

geonode/maps/models.py

@@ -20,7 +20,6 @@
 import logging
 
 import itertools
-from typing import Iterator
 
 from deprecated import deprecated
 from django.db import models

geonode/resource/utils.py

@@ -29,7 +29,6 @@
 from django.utils import timezone
 from django.core.exceptions import FieldDoesNotExist
 from django.utils.translation import ugettext_lazy as _
-from django.contrib.gis.geos import MultiPolygon
 from geonode.utils import OGC_Servers_Handler
 from django.utils.module_loading import import_string