Skip to content
Snippets Groups Projects

Merge dev into master for v0.58.0 release

Merged Moul requested to merge dev into master
28 files
+ 263
261
Compare changes
  • Side-by-side
  • Inline

Files

+ 10
6
@@ -41,8 +41,8 @@ def parse_text(text: str, schema: dict) -> Any:
@@ -41,8 +41,8 @@ def parse_text(text: str, schema: dict) -> Any:
try:
try:
data = json.loads(text)
data = json.loads(text)
jsonschema.validate(data, schema)
jsonschema.validate(data, schema)
except (TypeError, json.decoder.JSONDecodeError):
except (TypeError, json.decoder.JSONDecodeError) as e:
raise jsonschema.ValidationError("Could not parse json")
raise jsonschema.ValidationError("Could not parse json") from e
return data
return data
@@ -58,7 +58,9 @@ def parse_error(text: str) -> Any:
@@ -58,7 +58,9 @@ def parse_error(text: str) -> Any:
data = json.loads(text)
data = json.loads(text)
jsonschema.validate(data, ERROR_SCHEMA)
jsonschema.validate(data, ERROR_SCHEMA)
except (TypeError, json.decoder.JSONDecodeError) as e:
except (TypeError, json.decoder.JSONDecodeError) as e:
raise jsonschema.ValidationError("Could not parse json : {0}".format(str(e)))
raise jsonschema.ValidationError(
 
"Could not parse json : {0}".format(str(e))
 
) from e
return data
return data
@@ -78,7 +80,9 @@ async def parse_response(response: ClientResponse, schema: dict) -> Any:
@@ -78,7 +80,9 @@ async def parse_response(response: ClientResponse, schema: dict) -> Any:
jsonschema.validate(data, schema)
jsonschema.validate(data, schema)
return data
return data
except (TypeError, json.decoder.JSONDecodeError) as e:
except (TypeError, json.decoder.JSONDecodeError) as e:
raise jsonschema.ValidationError("Could not parse json : {0}".format(str(e)))
raise jsonschema.ValidationError(
 
"Could not parse json : {0}".format(str(e))
 
) from e
class WSConnection:
class WSConnection:
@@ -242,11 +246,11 @@ class API:
@@ -242,11 +246,11 @@ class API:
try:
try:
error_data = parse_error(await response.text())
error_data = parse_error(await response.text())
raise DuniterError(error_data)
raise DuniterError(error_data)
except (TypeError, jsonschema.ValidationError):
except (TypeError, jsonschema.ValidationError) as e:
raise ValueError(
raise ValueError(
"status code != 200 => %d (%s)"
"status code != 200 => %d (%s)"
% (response.status, (await response.text()))
% (response.status, (await response.text()))
)
) from e
return response
return response
Loading