diff --git a/owslib/catalogue/csw2.py b/owslib/catalogue/csw2.py index 2a56b541..e09555b7 100644 --- a/owslib/catalogue/csw2.py +++ b/owslib/catalogue/csw2.py @@ -20,8 +20,8 @@ from owslib import util from owslib import ows from owslib.iso import MD_Metadata, FC_FeatureCatalogue -from owslib.iso_3 import MD_Metadata as MD_Metadata_3 # ISO 19115 Part 3 XML -from owslib.iso_3 import FC_FeatureCatalogue as FC_FeatureCatalogue_3 # ISO 19115 Part 3 XML +from owslib.iso_3 import MD_Metadata as MD_Metadata_3 # ISO 19115 Part 3 XML +from owslib.iso_3 import FC_FeatureCatalogue as FC_FeatureCatalogue_3 # ISO 19115 Part 3 XML from owslib.fgdc import Metadata from owslib.dif import DIF from owslib.gm03 import GM03 @@ -580,7 +580,7 @@ def _parserecords(self, outputschema, esn): val = i.find(util.nspath_eval('gm03:fileIdentifier', namespaces)) identifier = self._setidentifierkey(util.testXMLValue(val)) self.records[identifier] = GM03(i) - elif MD_Metadata_3.handles(outputschema): # ISO 19115 Part 3 XML + elif MD_Metadata_3.handles(outputschema): # ISO 19115 Part 3 XML for elem, id in MD_Metadata_3.find_ids(self._exml): self.records[self._setidentifierkey(id)] = MD_Metadata_3(elem) for i in self._exml.findall('.//' + util.nspath_eval('gfc:FC_FeatureCatalogue', namespaces)): diff --git a/owslib/catalogue/csw3.py b/owslib/catalogue/csw3.py index 312551ec..77dbc36e 100644 --- a/owslib/catalogue/csw3.py +++ b/owslib/catalogue/csw3.py @@ -20,8 +20,8 @@ from owslib import util from owslib import ows from owslib.iso import MD_Metadata, FC_FeatureCatalogue -from owslib.iso_3 import MD_Metadata as MD_Metadata_3 # ISO 19115 Part 3 XML -from owslib.iso_3 import FC_FeatureCatalogue as FC_FeatureCatalogue_3 # ISO 19115 Part 3 XML +from owslib.iso_3 import MD_Metadata as MD_Metadata_3 # ISO 19115 Part 3 XML +from owslib.iso_3 import FC_FeatureCatalogue as FC_FeatureCatalogue_3 # ISO 19115 Part 3 XML from owslib.fgdc import Metadata from owslib.dif import DIF from owslib.gm03 import GM03 @@ -479,7 +479,7 @@ def _parserecords(self, outputschema, esn): val = i.find(util.nspath_eval('gm03:fileIdentifier', namespaces)) identifier = self._setidentifierkey(util.testXMLValue(val)) self.records[identifier] = GM03(i) - elif MD_Metadata_3.handles(outputschema): # ISO 19115 Part 3 XML + elif MD_Metadata_3.handles(outputschema): # ISO 19115 Part 3 XML for elem, id in MD_Metadata_3.find_ids(self._exml): self.records[self._setidentifierkey(id)] = MD_Metadata_3(elem) for i in self._exml.findall('.//' + util.nspath_eval('gfc:FC_FeatureCatalogue', namespaces)): diff --git a/owslib/feature/wfs100.py b/owslib/feature/wfs100.py index 7baba92d..11d181c1 100644 --- a/owslib/feature/wfs100.py +++ b/owslib/feature/wfs100.py @@ -25,7 +25,7 @@ from owslib.etree import etree from owslib.fgdc import Metadata from owslib.iso import MD_Metadata -from owslib.iso_3 import MD_Metadata as MD_Metadata_3 # ISO 19115 Part 3 XML +from owslib.iso_3 import MD_Metadata as MD_Metadata_3 # ISO 19115 Part 3 XML from owslib.crs import Crs from owslib.namespaces import Namespaces from owslib.feature.schema import get_schema diff --git a/owslib/feature/wfs110.py b/owslib/feature/wfs110.py index 268467d4..0977cf75 100644 --- a/owslib/feature/wfs110.py +++ b/owslib/feature/wfs110.py @@ -18,7 +18,7 @@ from owslib.etree import etree from owslib.fgdc import Metadata from owslib.iso import MD_Metadata -from owslib.iso_3 import MD_Metadata as MD_Metadata_3 # ISO 19115 Part 3 XML +from owslib.iso_3 import MD_Metadata as MD_Metadata_3 # ISO 19115 Part 3 XML from owslib.ows import ( OwsCommon, ServiceIdentification, diff --git a/owslib/map/wms130.py b/owslib/map/wms130.py index c787dc92..d2faaf43 100644 --- a/owslib/map/wms130.py +++ b/owslib/map/wms130.py @@ -23,7 +23,7 @@ nspath_eval, bind_url, Authentication) from owslib.fgdc import Metadata from owslib.iso import MD_Metadata -from owslib.iso_3 import MD_Metadata as MD_Metadata_3 # ISO 19115 Part 3 XML +from owslib.iso_3 import MD_Metadata as MD_Metadata_3 # ISO 19115 Part 3 XML from owslib.crs import Crs from owslib.namespaces import Namespaces from owslib.map.common import WMSCapabilitiesReader, AbstractContentMetadata