[pywps] 01/05: Imported Upstream version 3.2.6

[Bas Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository pywps.

commit d5d1ff88727abde50aaf732bd3531e3b38e8ff6d
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Thu Jun 30 19:13:06 2016 +0200

    Imported Upstream version 3.2.6
---
 debian/changelog              | 12 ++++++++++++
 debian/control                |  2 +-
 doc/source/conf.py            |  2 +-
 pywps/Wps/Execute/__init__.py |  9 ++++++---
 rpm/pywps.changes             |  4 ++++
 rpm/pywps.spec                |  4 ++--
 setup.py                      |  2 +-
 wps.py                        |  2 +-
 8 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b572ba4..deedfcb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+pywps (3.2.6) trusty; urgency=medium
+
+  * check complexinputs
+
+ -- Tom Kralidis <tomkralidis at gmail.com>  Thu, 30 Jun 2016 10:51:32 -0000
+
+pywps (3.2.5-1) trusty; urgency=medium
+
+  * Added lxml to control file
+
+ -- Angelos Tzotsos <gcpp.kalxas at gmail.com>  Tue, 01 Mar 2016 18:53:00 +0200
+
 pywps (3.2.5) precise; urgency=medium
 
   * file handling fixes
diff --git a/debian/control b/debian/control
index 60568d3..fbef85c 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: pywps
 Section: python
 Priority: optional
 Maintainer: Jachym Cepicky <jachym at les-ejk.cz>
-Build-Depends: debhelper (>= 9), python, python-setuptools
+Build-Depends: debhelper (>= 9), python, python-setuptools, python-lxml
 Standards-Version: 3.9.5
 X-Python-Version: >= 2.7
 Vcs-Git: https://github.com/geopython/pywps.git
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 9a549f7..d574bfb 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -45,7 +45,7 @@ copyright = u'2010, Jachym Cepicky'
 # built documents.
 #
 # The short X.Y version.
-version = '3.2.5'
+version = '3.2.6'
 # The full version, including alpha/beta/rc tags.
 release = version
 
diff --git a/pywps/Wps/Execute/__init__.py b/pywps/Wps/Execute/__init__.py
index 3b31386..f897983 100644
--- a/pywps/Wps/Execute/__init__.py
+++ b/pywps/Wps/Execute/__init__.py
@@ -838,9 +838,12 @@ class Execute(Request):
         """
        
         #complexInput needs to be replicated
-        complexInput["encoding"]=wpsInput["encoding"]
-        complexInput["mimetype"]=wpsInput["mimetype"]
-        complexInput["schema"]=wpsInput["schema"]
+        if wpsInput.has_key("encoding"):
+            complexInput["encoding"]=wpsInput["encoding"]
+        if wpsInput.has_key("mimetype"):
+            complexInput["mimetype"]=wpsInput["mimetype"]
+        if wpsInput.has_key("schema"):
+            complexInput["schema"]=wpsInput["schema"]
         complexInput["complexdata"]=wpsInput["value"]
         
         return complexInput
diff --git a/rpm/pywps.changes b/rpm/pywps.changes
index 8cca65a..a9d79fb 100644
--- a/rpm/pywps.changes
+++ b/rpm/pywps.changes
@@ -1,3 +1,7 @@
+Thu Jun  1 10:53:32 UTC 2016 - tomkralidis at gmail.com
+
+- Updated to 3.2.6
+
 Tue Mar  1 14:38:27 UTC 2016 - tomkralidis at gmail.com
 
 - Updated to 3.2.5
diff --git a/rpm/pywps.spec b/rpm/pywps.spec
index 6e73341..839ecb2 100644
--- a/rpm/pywps.spec
+++ b/rpm/pywps.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package pywps (3.2.5)
+# spec file for package pywps (3.2.6)
 #
 # Copyright (c) 2012 Angelos Tzotsos <tzotsos at opensuse.org>
 # Copyright (c) 2016 Tom Kralidis <tomkralidis at gmail.com>
@@ -16,7 +16,7 @@
 %define pyname pywps
 
 Name:           python-%{pyname}
-Version:        3.2.5
+Version:        3.2.6
 Release:        1
 License:        GPL
 Summary:        OGC Web Processing Servisce in Python
diff --git a/setup.py b/setup.py
index c0a17bf..af3433c 100644
--- a/setup.py
+++ b/setup.py
@@ -68,7 +68,7 @@ with open('requirements.txt') as fh:
 
 dist =  setup(
         name = name,
-        version = '3.2.5',
+        version = '3.2.6',
         maintainer="Jachym Cepicky",
         maintainer_email = 'jachym.cepicky at gmail.com',
         author = 'Jachym Cepicky',
diff --git a/wps.py b/wps.py
index 126003b..3e19a1c 100755
--- a/wps.py
+++ b/wps.py
@@ -30,7 +30,7 @@ License.
 
 Enjoy and happy GISing!
 """
-__version__ = "3.2.5"
+__version__ = "3.2.6"
 
 
 # Author:    Jachym Cepicky

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/pywps.git