minor code change for defensive style when zero Featuretypes in WFS (#…

…321)

* minor code change for defensive style when zero featsure types in WFS

* fix flake8 errors after flake8 upgrade to 3.8.2

* pin flake8 and pylint to 3.8.2 and 2.5.2 for reproducable builds

GeoHealthCheck/healthcheck.py

@@ -62,7 +62,7 @@ def db_commit():
     try:
         DB.session.commit()
     except Exception as err:
-        LOGGER.warning("Cannot commit to database %s".format(err))
+        LOGGER.warning('Cannot commit to database {}'.format(err))
         DB.session.rollback()
     # finally:
     #     DB.session.close()

GeoHealthCheck/plugins/probe/wfs.py

@@ -137,6 +137,9 @@ def expand_params(self, resource):
         try:
             wfs = self.get_metadata_cached(resource, version='1.1.0')
             feature_types = wfs.contents
+            if not feature_types:
+                raise Exception('No Feature Types in WFS')
+
             feature_type_names = list(feature_types.keys())
             self.layer_count = len(feature_type_names)
 
@@ -176,10 +179,8 @@ def expand_params(self, resource):
             #             oper.formatOptions
             #         break
 
-            # Take random feature_type to determine generic attrs
-            for feature_type_name in feature_types:
-                feature_type_entry = feature_types[feature_type_name]
-                break
+            # Take first feature_type to determine generic attrs
+            feature_type_entry = feature_types[feature_type_names[0]]
 
             # SRS
             crs_list = feature_type_entry.crsOptions

GeoHealthCheck/plugins/probe/wfs3.py

@@ -279,9 +279,9 @@ def wfs3_api_doc(wfs3):
 
     api_url = None
 
-    for l in wfs3.links:
-        if l['rel'] == 'service-desc':
-            api_url = l['href']
+    for link in wfs3.links:
+        if link['rel'] == 'service-desc':
+            api_url = link['href']
 
     if not api_url:
         raise RuntimeError('Did not find service-desc link in landing page')

requirements-dev.txt

@@ -1,3 +1,3 @@
-flake8
+flake8==3.8.2
 Paver==1.3.4
-pylint
+pylint==2.5.2