[elbe-devel] [PATCH 10/25] py3: print error if spyne is not available

[Torben Hohn]

On Fri, Dec 08, 2017 at 07:08:41PM +0100, Manuel Traut wrote:
> python3-spyne is not available in debian at the moment.
> This prints a warning to enable the user installing it from another
> source.

When we have python3-spyne i want the exit removed again.
This is really bad.

And it only gets a 'Reviewed-by: Torben Hohn <torben.hohn at linutronix.de>'
when you exit with 20 instead of -20.

2 places, where is must be fixed.

> 
> Signed-off-by: Manuel Traut <manut at linutronix.de>
> ---
>  elbepack/daemons/soap/__init__.py | 18 +++++++++++++-----
>  elbepack/daemons/soap/esoap.py    | 25 ++++++++++++++++---------
>  2 files changed, 29 insertions(+), 14 deletions(-)
> 
> diff --git a/elbepack/daemons/soap/__init__.py b/elbepack/daemons/soap/__init__.py
> index 623f76f8..560333fc 100644
> --- a/elbepack/daemons/soap/__init__.py
> +++ b/elbepack/daemons/soap/__init__.py
> @@ -16,16 +16,24 @@
>  # You should have received a copy of the GNU General Public License
>  # along with ELBE.  If not, see <http://www.gnu.org/licenses/>.
>  
> -from esoap import ESoap
> +from __future__ import print_function
>  
> -from beaker.middleware import SessionMiddleware
> +import sys
>  
> -from spyne import Application
> -from spyne.protocol.soap import Soap11
> -from spyne.server.wsgi import WsgiApplication
> +from esoap import ESoap
>  
> +from beaker.middleware import SessionMiddleware
>  from cherrypy.process.plugins import SimplePlugin
>  
> +try:
> +    from spyne import Application
> +    from spyne.protocol.soap import Soap11
> +    from spyne.server.wsgi import WsgiApplication
> +except ImportError as e:
> +    print("failed to import spyne", file=sys.stderr)
> +    print("please install python(3)-spyne", file=sys.stderr)
> +    sys.exit(-20)

sys.exit (20)

> +
>  from elbepack.projectmanager import ProjectManager
>  
>  class EsoapApp(Application):
> diff --git a/elbepack/daemons/soap/esoap.py b/elbepack/daemons/soap/esoap.py
> index 8189a94f..711e8118 100644
> --- a/elbepack/daemons/soap/esoap.py
> +++ b/elbepack/daemons/soap/esoap.py
> @@ -18,26 +18,33 @@
>  # You should have received a copy of the GNU General Public License
>  # along with ELBE.  If not, see <http://www.gnu.org/licenses/>.
>  
> +from __future__ import print_function
> +
>  import binascii
>  import os
>  import tarfile
>  import fnmatch
> +import sys
>  
>  from tempfile import NamedTemporaryFile
>  
>  from elbepack.shellhelper import system
>  from elbepack.version import elbe_version
> -
> -from faults import soap_faults
> -
>  from elbepack.elbexml import ValidationMode
> -from datatypes import SoapProject, SoapFile
> -from authentication import authenticated_admin, authenticated_uid
>  
> -from spyne.service import ServiceBase
> -from spyne.decorator import rpc
> -from spyne.model.primitive import String, Boolean, Integer
> -from spyne.model.complex import Array
> +from .faults import soap_faults
> +from .datatypes import SoapProject, SoapFile
> +from .authentication import authenticated_admin, authenticated_uid
> +
> +try:
> +    from spyne.service import ServiceBase
> +    from spyne.decorator import rpc
> +    from spyne.model.primitive import String, Boolean, Integer
> +    from spyne.model.complex import Array
> +except ImportError as e:
> +    print("failed to import spyne", file=sys.stderr)
> +    print("please install python(3)-spyne", file=sys.stderr)
> +    sys.exit(-20)

sys.exit (20)

>  
>  class ESoap (ServiceBase):
>  
> -- 
> 2.15.1
> 
> 
> _______________________________________________
> elbe-devel mailing list
> elbe-devel at linutronix.de
> https://lists.linutronix.de/mailman/listinfo/elbe-devel

-- 
Mit freundlichen Grüßen
Torben Hohn

Linutronix GmbH

Standort: Bremen

Phone: +49 7556 25 999 18; Fax.: +49 7556 25 999 99

Firmensitz / Registered Office: D-88690 Uhldingen, Bahnhofstr. 3
Registergericht / Local District Court: Amtsgericht Freiburg i. Br.; HRB
Nr. / Trade register no.: 700 806

Geschäftsführer / Managing Directors: Heinz Egger, Thomas Gleixner

Eine Bitte von uns: Sollten Sie diese E-Mail irrtümlich erhalten haben,
benachrichtigen Sie uns in diesem Falle bitte sobald wie es Ihnen
möglich ist, durch Antwort-Mail. Vielen Dank!
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 473 bytes
Desc: Digital signature
URL: <http://lists.linutronix.de/pipermail/elbe-devel/attachments/20171215/8dc2e76a/attachment.sig>