Ensure Invalid JSON and errors during deletes are displayed correctly
Change-Id: Iccd4ee10611cfa58a98618f29545d5b194edafa3
This commit is contained in:
		@@ -122,5 +122,6 @@ class UpdateCommand(Command, ShowOne):
 | 
				
			|||||||
        return results.keys(), results.values()
 | 
					        return results.keys(), results.values()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
class DeleteCommand(Command):
 | 
					class DeleteCommand(Command, ShowOne):
 | 
				
			||||||
    pass
 | 
					    def post_execute(self, results):
 | 
				
			||||||
 | 
					        return [], []
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -88,16 +88,22 @@ class Client(object):
 | 
				
			|||||||
        # Trigger the request
 | 
					        # Trigger the request
 | 
				
			||||||
        response = func(*args, **kw)
 | 
					        response = func(*args, **kw)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        # Decode is response, if possible
 | 
				
			||||||
 | 
					        try:
 | 
				
			||||||
 | 
					            response_payload = response.json()
 | 
				
			||||||
 | 
					        except ValueError:
 | 
				
			||||||
 | 
					            response_payload = {}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        if response.status_code == 400:
 | 
					        if response.status_code == 400:
 | 
				
			||||||
            raise exceptions.BadRequest(**response.json())
 | 
					            raise exceptions.BadRequest(**response_payload)
 | 
				
			||||||
        elif response.status_code in (401, 403):
 | 
					        elif response.status_code in (401, 403):
 | 
				
			||||||
            raise exceptions.Forbidden(**response.json())
 | 
					            raise exceptions.Forbidden(**response_payload)
 | 
				
			||||||
        elif response.status_code == 404:
 | 
					        elif response.status_code == 404:
 | 
				
			||||||
            raise exceptions.NotFound(**response.json())
 | 
					            raise exceptions.NotFound(**response_payload)
 | 
				
			||||||
        elif response.status_code == 409:
 | 
					        elif response.status_code == 409:
 | 
				
			||||||
            raise exceptions.Conflict(**response.json())
 | 
					            raise exceptions.Conflict(**response_payload)
 | 
				
			||||||
        elif response.status_code == 500:
 | 
					        elif response.status_code >= 500:
 | 
				
			||||||
            raise exceptions.Unknown(**response.json())
 | 
					            raise exceptions.Unknown(**response_payload)
 | 
				
			||||||
        else:
 | 
					        else:
 | 
				
			||||||
            return response
 | 
					            return response
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user