Skip to content

Commit e69da97

Browse files
authored
Fix FutureWarnings for testing lxml elements (#979)
1 parent c80d8b0 commit e69da97

File tree

3 files changed

+16
-6
lines changed

3 files changed

+16
-6
lines changed

owslib/feature/wfs110.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -444,9 +444,11 @@ def parse_remote_metadata(self, timeout=30):
444444
elif metadataUrl["type"] in ["TC211", "19115", "19139"]:
445445
mdelem = doc.find(
446446
".//" + nspath_eval("gmd:MD_Metadata", namespaces)
447-
) or doc.find(
448-
".//" + nspath_eval("gmi:MI_Metadata", namespaces)
449447
)
448+
if mdelem is None:
449+
mdelem = doc.find(
450+
".//" + nspath_eval("gmi:MI_Metadata", namespaces)
451+
)
450452
if mdelem is not None:
451453
metadataUrl["metadata"] = MD_Metadata(mdelem)
452454
else:

owslib/feature/wfs200.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -567,9 +567,11 @@ def parse_remote_metadata(self, timeout=30):
567567

568568
mdelem = doc.find(
569569
".//" + util.nspath_eval("gmd:MD_Metadata", n.get_namespaces(["gmd"]))
570-
) or doc.find(
571-
".//" + util.nspath_eval("gmi:MI_Metadata", n.get_namespaces(["gmi"]))
572570
)
571+
if mdelem is None:
572+
mdelem = doc.find(
573+
".//" + util.nspath_eval("gmi:MI_Metadata", n.get_namespaces(["gmi"]))
574+
)
573575
if mdelem is not None:
574576
metadataUrl["metadata"] = MD_Metadata(mdelem)
575577
continue

owslib/map/wms130.py

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -703,8 +703,14 @@ def parse_remote_metadata(self, timeout=30):
703703
metadataUrl['metadata'] = Metadata(mdelem)
704704
continue
705705

706-
mdelem = doc.find('.//' + nspath_eval('gmd:MD_Metadata', n.get_namespaces(['gmd']))) \
707-
or doc.find('.//' + nspath_eval('gmi:MI_Metadata', n.get_namespaces(['gmi'])))
706+
mdelem = doc.find(
707+
'.//' + nspath_eval('gmd:MD_Metadata', n.get_namespaces(['gmd']))
708+
)
709+
if mdelem is None:
710+
doc.find(
711+
'.//' + nspath_eval('gmi:MI_Metadata', n.get_namespaces(['gmi']))
712+
)
713+
708714
if mdelem is not None:
709715
metadataUrl['metadata'] = MD_Metadata(mdelem)
710716
continue

0 commit comments

Comments
 (0)