diff --git a/geonode/base/forms.py b/geonode/base/forms.py index bfceef992f9..f545c6b0323 100644 --- a/geonode/base/forms.py +++ b/geonode/base/forms.py @@ -579,7 +579,7 @@ def __init__(self, *args, **kwargs): if field in ["owner"] and not self.can_change_perms: self.fields[field].disabled = True - if field in ['poc', 'owner'] and not self.can_change_perms: + if field in ["poc", "owner"] and not self.can_change_perms: self.fields[field].disabled = True def disable_keywords_widget_for_non_superuser(self, user): diff --git a/geonode/base/views.py b/geonode/base/views.py index 86a8c1b58a4..2d13abe8ae0 100644 --- a/geonode/base/views.py +++ b/geonode/base/views.py @@ -357,15 +357,16 @@ def get_results(self, context): class DatasetsAutocomplete(SimpleSelect2View): model = Dataset - filter_arg = 'title__icontains' + filter_arg = "title__icontains" def get_results(self, context): return [ { - 'id': self.get_result_value(result), - 'text': self.get_result_label(result.title), - 'selected_text': self.get_selected_result_label(result.title), - } for result in context['object_list'] + "id": self.get_result_value(result), + "text": self.get_result_label(result.title), + "selected_text": self.get_selected_result_label(result.title), + } + for result in context["object_list"] ] diff --git a/geonode/geoserver/signals.py b/geonode/geoserver/signals.py index 591a1e12552..cfe1ad6f85b 100644 --- a/geonode/geoserver/signals.py +++ b/geonode/geoserver/signals.py @@ -42,7 +42,7 @@ geofence_rule_assign = Signal(providing_args=["instance"]) -post_set_permissions = Signal(providing_args=['instance']) +geofence_rule_assign = Signal(providing_args=["instance"]) def geoserver_delete(typename): diff --git a/geonode/security/tests.py b/geonode/security/tests.py index b04dba3b2ae..25f0613d2f3 100644 --- a/geonode/security/tests.py +++ b/geonode/security/tests.py @@ -90,11 +90,13 @@ def _log(msg, *args): def get_geofence_rules_count(): from geonode.geoserver.helpers import gf_client + return gf_client.get_rules_count() def get_geofence_rules(): from geonode.geoserver.helpers import gf_client + return gf_client.get_rules() @@ -1758,11 +1760,11 @@ def test_admin_whitelisted_access_middleware(self): self.assertTrue(request.user.is_superuser) # Test valid IP in second element - with self.settings(ADMIN_IP_WHITELIST=['88.88.88.88', '127.0.0.1']): + with self.settings(ADMIN_IP_WHITELIST=["88.88.88.88", "127.0.0.1"]): request = HttpRequest() request.user = admin - request.path = reverse('home') - request.META['REMOTE_ADDR'] = '127.0.0.1' + request.path = reverse("home") + request.META["REMOTE_ADDR"] = "127.0.0.1" middleware.process_request(request) self.assertTrue(request.user.is_superuser) diff --git a/geonode/storage/tests.py b/geonode/storage/tests.py index dedef558e0c..a44d9a460ee 100644 --- a/geonode/storage/tests.py +++ b/geonode/storage/tests.py @@ -420,9 +420,9 @@ def test_storage_manager_copy(self): @override_settings(FILE_UPLOAD_DIRECTORY_PERMISSIONS=0o777) @override_settings(FILE_UPLOAD_PERMISSIONS=0o777) def test_storage_manager_copy(self): - ''' + """ Test that the copy works as expected and the permissions are corerct - ''' + """ dataset = create_single_dataset(name="test_copy") dataset.files = [os.path.join(f"{self.project_root}", "tests/data/test_sld.sld")] dataset.save() diff --git a/geonode/upload/__init__.py b/geonode/upload/__init__.py index f8afdf61568..8be4d76cb36 100644 --- a/geonode/upload/__init__.py +++ b/geonode/upload/__init__.py @@ -52,14 +52,15 @@ def run_setup_hooks(sender, **kwargs): every=1, period="days" ) + daily_interval, _ = IntervalSchedule.objects.get_or_create(every=1, period="days") PeriodicTask.objects.update_or_create( name="clean-up-old-task-result", defaults=dict( task="geonode.upload.tasks.cleanup_celery_task_entries", interval=daily_interval, - args='', - start_time=timezone.now() - ) + args="", + start_time=timezone.now(), + ), ) @@ -73,9 +74,9 @@ def ready(self): "task": "geonode.upload.tasks.cleanup_celery_task_entries", "schedule": 86400.0, } - settings.CELERY_BEAT_SCHEDULE['clean-up-old-task-result'] = { - 'task': 'geonode.upload.tasks.cleanup_celery_task_entries', - 'schedule': 86400.0, + settings.CELERY_BEAT_SCHEDULE["clean-up-old-task-result"] = { + "task": "geonode.upload.tasks.cleanup_celery_task_entries", + "schedule": 86400.0, }