This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository owslib.
commit f297c6c4352ac2cca61eeeba3b754f82f9082d84 Author: Bas Couwenberg <[email protected]> Date: Fri Dec 25 16:23:09 2015 +0100 Imported Upstream version 0.10.1 --- .travis.yml | 2 -- VERSION.txt | 2 +- owslib/__init__.py | 2 +- owslib/gm03.py | 24 ++++++++++++++++-------- tests/doctests/gm03_parse.txt | 4 ++-- 5 files changed, 20 insertions(+), 14 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7300777..f84133f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,8 +2,6 @@ language: python python: - "2.6" - "2.7" - - "3.2" - - "3.3" - "3.4" # - "pypy" sudo: false diff --git a/VERSION.txt b/VERSION.txt index 78bc1ab..5712157 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -0.10.0 +0.10.1 diff --git a/owslib/__init__.py b/owslib/__init__.py index 737c2f4..788642e 100644 --- a/owslib/__init__.py +++ b/owslib/__init__.py @@ -1,3 +1,3 @@ from __future__ import (absolute_import, division, print_function) -__version__ = '0.10.0' +__version__ = '0.10.1' diff --git a/owslib/gm03.py b/owslib/gm03.py index 365f95a..fd27d86 100644 --- a/owslib/gm03.py +++ b/owslib/gm03.py @@ -247,7 +247,11 @@ class Core(object): self.reference_system_metadata = referenceSystemInfoMD_Metadata(val) val = md.find(util.nspath_eval('gm03:GM03_2_1Core.Core.CI_Citation', namespaces)) - if val is not None: + if val is None: + val = md.find(util.nspath_eval('gm03:GM03_2_1Comprehensive.Comprehensive.CI_Citation', namespaces)) + if val is not None: + self.citation = CI_Citation(val) + else: self.citation = CI_Citation(val) val = md.find(util.nspath_eval('gm03:GM03_2_1Core.Core.CI_Contact', namespaces)) @@ -278,13 +282,17 @@ class Core(object): if val is not None: self.identifier = MD_Identifier(val) - val = md.find(util.nspath_eval('gm03:GM03_2_1Core.Core.MD_Keywords', namespaces)) - if val is not None: - self.keywords = MD_Keywords(val) + self.keywords = [] + for kw in md.findall(util.nspath_eval('gm03:GM03_2_1Core.Core.MD_Keywords', namespaces)): + self.keywords.append(MD_Keywords(kw)) val = md.find(util.nspath_eval('gm03:GM03_2_1Core.Core.MD_DataIdentification', namespaces)) - if val is not None: - self.data_identification = MD_Keywords(val) + if val is None: + val = md.find(util.nspath_eval('gm03:GM03_2_1Comprehensive.Comprehensive.MD_DataIdentification', namespaces)) + if val is not None: + self.data_identification = MD_DataIdentification(val) + else: + self.data_identification = MD_DataIdentification(val) val = md.find(util.nspath_eval('gm03:GM03_2_1Core.Core.RS_Identifier', namespaces)) if val is not None: @@ -316,7 +324,7 @@ class Core(object): val = md.find(util.nspath_eval('gm03:GM03_2_1Core.Core.MD_Metadatacontact', namespaces)) if val is not None: - self.identification_point_of_contact = MD_Metadatacontact(val) + self.metadata_point_of_contact = MD_Metadatacontact(val) val = md.find(util.nspath_eval('gm03:GM03_2_1Core.Core.spatialExtentEX_SpatialTemporalExtent', namespaces)) if val is not None: @@ -677,7 +685,7 @@ class CI_Citation(_GenericObject): val = md.find(util.nspath_eval('gm03:title', namespaces)) if val is not None: - self.title = PT_FreeText(md) + self.title = PT_FreeText(val) val = md.find(util.nspath_eval('gm03:MD_Authority', namespaces)) self.authority = _GenericObjectProperty(val) diff --git a/tests/doctests/gm03_parse.txt b/tests/doctests/gm03_parse.txt index d0ad718..dfb8dfa 100755 --- a/tests/doctests/gm03_parse.txt +++ b/tests/doctests/gm03_parse.txt @@ -19,9 +19,9 @@ Print testing some metadata elements >>> hasattr(gm03.data, 'comprehensive') True >>> len(gm03.data.comprehensive.elements) - 9 + 10 >>> sorted(list(gm03.data.comprehensive.elements.keys())) - ['address', 'contact', 'date', 'extent', 'extent_geographic_element', 'geographic_bounding_box', 'identification_point_of_contact', 'metadata', 'responsible_party'] + ['address', 'contact', 'date', 'extent', 'extent_geographic_element', 'geographic_bounding_box', 'identification_point_of_contact', 'keywords', 'metadata', 'responsible_party'] >>> isinstance(gm03.data.comprehensive.date, list) True >>> len(gm03.data.comprehensive.date) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/owslib.git _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
