python3: use modern except syntax
This commit is contained in:
parent
f9e22e1309
commit
a67f04b89c
|
@ -96,7 +96,7 @@ def call_event(request):
|
||||||
assert isinstance(payload['callee'], six.string_types), 'callee must be a string'
|
assert isinstance(payload['callee'], six.string_types), 'callee must be a string'
|
||||||
if 'data' in payload:
|
if 'data' in payload:
|
||||||
assert isinstance(payload['data'], dict), 'data must be a JSON object'
|
assert isinstance(payload['data'], dict), 'data must be a JSON object'
|
||||||
except (TypeError, ValueError, AssertionError), e:
|
except (TypeError, ValueError, AssertionError) as e:
|
||||||
return HttpResponseBadRequest(json.dumps({'err': 1, 'msg':
|
return HttpResponseBadRequest(json.dumps({'err': 1, 'msg':
|
||||||
force_text(e)}),
|
force_text(e)}),
|
||||||
content_type='application/json')
|
content_type='application/json')
|
||||||
|
@ -201,7 +201,7 @@ def take_line(request):
|
||||||
payload = json.loads(request.body)
|
payload = json.loads(request.body)
|
||||||
assert isinstance(payload, dict), 'payload is not a JSON object'
|
assert isinstance(payload, dict), 'payload is not a JSON object'
|
||||||
assert payload.keys() == ['callee'], 'payload must have only one key: callee'
|
assert payload.keys() == ['callee'], 'payload must have only one key: callee'
|
||||||
except (TypeError, ValueError, AssertionError), e:
|
except (TypeError, ValueError, AssertionError) as e:
|
||||||
return HttpResponseBadRequest(json.dumps({'err': 1, 'msg':
|
return HttpResponseBadRequest(json.dumps({'err': 1, 'msg':
|
||||||
force_text(e)}),
|
force_text(e)}),
|
||||||
content_type='application/json')
|
content_type='application/json')
|
||||||
|
@ -222,7 +222,7 @@ def release_line(request):
|
||||||
payload = json.loads(request.body)
|
payload = json.loads(request.body)
|
||||||
assert isinstance(payload, dict), 'payload is not a JSON object'
|
assert isinstance(payload, dict), 'payload is not a JSON object'
|
||||||
assert payload.keys() == ['callee'], 'payload must have only one key: callee'
|
assert payload.keys() == ['callee'], 'payload must have only one key: callee'
|
||||||
except (TypeError, ValueError, AssertionError), e:
|
except (TypeError, ValueError, AssertionError) as e:
|
||||||
return HttpResponseBadRequest(json.dumps({'err': 1, 'msg':
|
return HttpResponseBadRequest(json.dumps({'err': 1, 'msg':
|
||||||
force_text(e)}),
|
force_text(e)}),
|
||||||
content_type='application/json')
|
content_type='application/json')
|
||||||
|
|
|
@ -180,7 +180,7 @@ def create_formdata(request, *args, **kwargs):
|
||||||
qualif = Association.objects.get(id=kwargs.get('pk'))
|
qualif = Association.objects.get(id=kwargs.get('pk'))
|
||||||
try:
|
try:
|
||||||
qualif.push(request)
|
qualif.push(request)
|
||||||
except Exception, e:
|
except Exception as e:
|
||||||
json.dump({'err': 1, 'msg': str(e)}, response)
|
json.dump({'err': 1, 'msg': str(e)}, response)
|
||||||
return response
|
return response
|
||||||
json.dump({'result': 'ok', 'url': qualif.formdata_url}, response)
|
json.dump({'result': 'ok', 'url': qualif.formdata_url}, response)
|
||||||
|
|
Loading…
Reference in New Issue