[Issue #6843] Fetch dictionary keys with dict.get(...) where appropri…

…ate to provide default value (#6845) * Finished replacing for inline conditionals * Fixed undefined center in maps/tests.py * Fixed few missing get's Co-authored-by: Alessio Fabiani <[email protected]>
GeoNode · Jan 28, 2021 · d6f4f62 · d6f4f62
1 parent 1a94bbe
commit d6f4f62
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 23 deletions.
diff --git a/geonode/base/templatetags/base_tags.py b/geonode/base/templatetags/base_tags.py
@@ -80,7 +80,7 @@ def facets(context):
     date_lte_filter = request.GET.get('date__lte', None)
     date_range_filter = request.GET.get('date__range', None)
 
-    facet_type = context['facet_type'] if 'facet_type' in context else 'all'
+    facet_type = context.get('facet_type', 'all')
 
     if not settings.SKIP_PERMS_FILTER:
         authorized = []

diff --git a/geonode/geoserver/helpers.py b/geonode/geoserver/helpers.py
@@ -2201,8 +2201,7 @@ def decimal_encode(bbox):
             if 'styles' in request_body:
                 styles = request_body['styles']
 
-            ogc_server_location = request_body["ogc_server_location"] if "ogc_server_location" \
-                in request_body else ogc_server_settings.LOCATION
+            ogc_server_location = request_body.get("ogc_server_location", ogc_server_settings.LOCATION)
             wms_endpoint = getattr(ogc_server_settings, "WMS_ENDPOINT") or 'wms'
             wms_version = getattr(ogc_server_settings, "WMS_VERSION") or '1.1.0'
             wms_format = getattr(ogc_server_settings, "WMS_FORMAT") or 'image/png'

diff --git a/geonode/layers/utils.py b/geonode/layers/utils.py
@@ -1059,9 +1059,8 @@ def create_thumbnail(instance, thumbnail_remote_url, thumbnail_create_url=None,
                                 thumbnail_create_url = thumbnail_create_url + '&%s=%s' % (str(_p), str(params[_p]))
                         _ogc_server_settings = settings.OGC_SERVER['default']
                         if check_ogc_backend(geoserver.BACKEND_PACKAGE):
-                            _user = _ogc_server_settings['USER'] if 'USER' in _ogc_server_settings else 'admin'
-                            _pwd = _ogc_server_settings['PASSWORD'] if \
-                                'PASSWORD' in _ogc_server_settings else 'geoserver'
+                            _user = _ogc_server_settings.get('USER', 'admin')
+                            _pwd = _ogc_server_settings.get('PASSWORD', 'geoserver')
                             import base64
                             valid_uname_pw = base64.b64encode(
                                 ("%s:%s" % (_user, _pwd)).encode("UTF-8")).decode("ascii")

diff --git a/geonode/maps/tests.py b/geonode/maps/tests.py
@@ -697,10 +697,11 @@ def test_map_embed(self):
             response_config_dict['about']['title'])
 
         map_obj.update_from_viewer(config_map, context={})
-        title = config_map['title'] if 'title' in config_map else config_map['about']['title']
-        abstract = config_map['abstract'] if 'abstract' in config_map else config_map['about']['abstract']
-        center = config_map['map']['center'] if 'center' in config_map['map'] else settings.DEFAULT_MAP_CENTER
-        zoom = config_map['map']['zoom'] if 'zoom' in config_map['map'] else settings.DEFAULT_MAP_ZOOM
+        title = config_map.get('title', config_map['about']['title'])
+        abstract = config_map.get('abstract', config_map['about']['abstract'])
+        center = config_map['map'].get('center', settings.DEFAULT_CONTENT_TYPE)
+        zoom = config_map['map'].get('zoom', settings.DEFAULT_MAP_ZOOM)
+
         projection = config_map['map']['projection']
 
         self.assertEqual(map_obj.title, title)
@@ -761,10 +762,10 @@ def test_map_view(self):
             response_config_dict['about']['title'])
 
         map_obj.update_from_viewer(config_map, context={})
-        title = config_map['title'] if 'title' in config_map else config_map['about']['title']
-        abstract = config_map['abstract'] if 'abstract' in config_map else config_map['about']['abstract']
-        center = config_map['map']['center'] if 'center' in config_map['map'] else settings.DEFAULT_MAP_CENTER
-        zoom = config_map['map']['zoom'] if 'zoom' in config_map['map'] else settings.DEFAULT_MAP_ZOOM
+        title = config_map.get('title', config_map['about']['title'])
+        abstract = config_map.get('abstract', config_map['about']['abstract'])
+        center = config_map['map'].get('center', settings.DEFAULT_MAP_CENTER)
+        zoom = config_map['map'].get('zoom', settings.DEFAULT_MAP_ZOOM)
         projection = config_map['map']['projection']
 
         self.assertEqual(map_obj.title, title)

diff --git a/geonode/utils.py b/geonode/utils.py
@@ -1416,15 +1416,13 @@ def __init__(self):
         self.password = 'admin'
         if check_ogc_backend(geoserver.BACKEND_PACKAGE):
             ogc_server_settings = settings.OGC_SERVER['default']
-            self.timeout = ogc_server_settings['TIMEOUT'] if 'TIMEOUT' in ogc_server_settings else 60
-            self.retries = ogc_server_settings['MAX_RETRIES'] if 'MAX_RETRIES' in ogc_server_settings else 5
-            self.backoff_factor = ogc_server_settings['BACKOFF_FACTOR'] if \
-            'BACKOFF_FACTOR' in ogc_server_settings else 0.3
-            self.pool_maxsize = ogc_server_settings['POOL_MAXSIZE'] if 'POOL_MAXSIZE' in ogc_server_settings else 10
-            self.pool_connections = ogc_server_settings['POOL_CONNECTIONS'] if \
-            'POOL_CONNECTIONS' in ogc_server_settings else 10
-            self.username = ogc_server_settings['USER'] if 'USER' in ogc_server_settings else 'admin'
-            self.password = ogc_server_settings['PASSWORD'] if 'PASSWORD' in ogc_server_settings else 'geoserver'
+            self.timeout = ogc_server_settings.get('TIMEOUT', 60)
+            self.retries = ogc_server_settings.get('MAX_RETRIES', 5)
+            self.backoff_factor = ogc_server_settings.get('BACKOFF_FACTOR', 0.3)
+            self.pool_maxsize = ogc_server_settings.get('POOL_MAXSIZE', 10)
+            self.pool_connections = ogc_server_settings.get('POOL_CONNECTIONS', 10)
+            self.username = ogc_server_settings.get('USER', 'admin')
+            self.password = ogc_server_settings.get('PASSWORD', 'geoserver')
 
     def request(self, url, method='GET', data=None, headers={}, stream=False, timeout=None, retries=None, user=None):
         if (user or self.username != 'admin') and \