Handle JSON parsing errors

Author: laurynas

detectlanguage/api.py

@@ -13,4 +13,3 @@ def user_status():
 
 def languages():
 	return detectlanguage.client.get('languages')
-

detectlanguage/client.py

@@ -1,6 +1,12 @@
 import requests
 
 from .exceptions import *
+from requests.exceptions import HTTPError
+
+try:
+    from json.decoder import JSONDecodeError
+except ImportError:
+    JSONDecodeError = ValueError
 
 class Client:
 	def __init__(self, configuration):
@@ -15,14 +21,25 @@ def post(self, path, payload):
 		return self.handle_response(r)
 
 	def handle_response(self, r):
-		json = r.json()
+		try:
+			r.raise_for_status()
 
-		if 'error' in json:
-			raise DetectLanguageError(json['error']['message'])
+			return r.json()
+		except HTTPError as err:
+			self.handle_http_error(r, err)
+		except JSONDecodeError:
+			raise DetectLanguageError("Error decoding response JSON")
 
-		r.raise_for_status()
+	def handle_http_error(self, r, err):
+		try:
+			json = r.json()
 
-		return json
+			if not 'error' in json:
+				raise DetectLanguageError(err)
+
+			raise DetectLanguageError(json['error']['message'])
+		except JSONDecodeError:
+			raise DetectLanguageError(err)
 
 	def url(self, path):
 		return "%s://%s/%s/%s" % (self.protocol(), self.configuration.host, self.configuration.api_version, path)