Merge branch 'develop' into dist/risotto/risotto-2.8.0/develop

scripts/cucchiaiata-cli

@@ -4,7 +4,7 @@
 from sys import exit, argv
 from json import dumps
 from traceback import print_exc
-from cucchiaiata import Parser, config, Configuration
+from cucchiaiata import Parser, config, Configuration, JsonError
 from cucchiaiata.i18n import _
 
 
@@ -15,9 +15,15 @@ def main():
         else:
             parser = Parser()
             print(dumps(parser.get(),
-                        indent=config.indent))
+                        indent=config.indent),
+                        )
     except KeyboardInterrupt:
         pass
+    except JsonError as err:
+        print(dumps(err.message,
+                    indent=config.indent),
+                    )
+        exit(1)
     except Exception as err:
         if config.debug:
             print_exc()

src/cucchiaiata/__init__.py

@@ -1,6 +1,7 @@
 from .parser import Parser
 from .configuration import Configuration
 from .config import config
+from .common import JsonError
 
-__all__ = ('Parser', 'config')
+__all__ = ('Parser', 'config', 'Configuration', 'JsonError')
 __version__ = "0.0.1"

src/cucchiaiata/common.py

@@ -13,6 +13,10 @@ if config.allow_insecure_https:
     warnings.simplefilter('ignore', InsecureRequestWarning)
 
 
+class JsonError(Exception):
+    pass
+
+
 class Common:
     def __init__(self):
         self.cucchiaiata_config = config
@@ -97,11 +101,12 @@ def send_data(uri: str,
     ret = post(final_url,
                data=dumps(payload),
                verify=config.allow_insecure_https)
-    if ret.status_code != 200:
+    try:
-        raise Exception(ret.text)
         response = ret.json()
-    if 'error' in response:
+    except:
-        if 'reason' in response['error']['kwargs']:
+        raise Exception(ret.text)
-            raise Exception("{}".format(response['error']['kwargs']['reason']))
+    if response['type'] == 'error':
-        raise Exception('erreur inconnue')
+        err = JsonError()
+        err.message = response['response']
+        raise err
     return response['response']