resolve comments Tom

Author: pvgenuchten

owslib/catalogue/csw2.py

@@ -859,12 +859,13 @@ def __init__(self, record):
         self.spatial = None
         if val is not None:
             val = util.testXMLValue(val)
-            if len(val.split(',')) == 4:
+            bbox_tokens = val.split(',')
+            if len(bbox_tokens) == 4:
                 self.bbox = ows.BoundingBox(None, namespaces['ows'])
-                self.bbox.minx = val.split(',')[0]
-                self.bbox.miny = val.split(',')[1]
-                self.bbox.maxx = val.split(',')[2]
-                self.bbox.maxy = val.split(',')[3]
+                self.bbox.minx = bbox_tokens[0]
+                self.bbox.miny = bbox_tokens[1]
+                self.bbox.maxx = bbox_tokens[2]
+                self.bbox.maxy = bbox_tokens[3]
             else:
                 self.spatial = val
 

owslib/catalogue/csw3.py

@@ -761,12 +761,13 @@ def __init__(self, record):
         self.spatial = None
         if val is not None:
             val = util.testXMLValue(val)
-            if len(val.split(',')) == 4:
+            bbox_tokens = val.split(',')
+            if len(bbox_tokens) == 4:
                 self.bbox = ows.BoundingBox(None, namespaces['ows'])
-                self.bbox.minx = val.split(',')[0]
-                self.bbox.miny = val.split(',')[1]
-                self.bbox.maxx = val.split(',')[2]
-                self.bbox.maxy = val.split(',')[3]
+                self.bbox.minx = bbox_tokens[0]
+                self.bbox.miny = bbox_tokens[1]
+                self.bbox.maxx = bbox_tokens[2]
+                self.bbox.maxy = bbox_tokens[3]
             else:
                 self.spatial = val
 

tests/test_csw_parsing.py

@@ -26,7 +26,7 @@ def get_md_resource(file_path):
     """
     namespaces = Namespaces().get_namespaces(keys=('dc', 'dct', 'ows', 'rdf', 'gml', 'csw'))
 
-    with io.open(file_path, mode='r', encoding='utf-8') as f:
+    with open(file_path, mode='r', encoding='utf-8') as f:
         data = f.read().encode('utf-8')
         mdelem = etree.fromstring(data)
 
@@ -64,6 +64,6 @@ def test_spatial_parsing():
     md_resource = get_md_resource('tests/resources/9250AA67-F3AC-6C12-0CB9-0662231AA181_dc2.xml')
     md = CswRecord(md_resource)
 
-    assert type(md) is CswRecord
+    assert isinstance(md, CswRecord)
     assert md.title == "Feasibility of Using the Two-Source Energy Balance Model (TSEB) with Sentinel-2 and Sentinel-3 Images to Analyze the Spatio-Temporal Variability of Vine Water Status in a Vineyard"
     assert md.bbox.minx == '-180'