issue #72

CHANGELOG.rst

@@ -4,6 +4,9 @@ Changelog
 1.0.3 (2015-02-03)
 ++++++++++++++++++
 
+- Fixed: `Issue #72 <https://github.com/maxtepkeev/python-redmine/issues/72>`__ (If an exception is
+ raised during JSON decoding process, it should be catched and reraised as Python Redmine's own
+ exception, i.e ``redmine.exceptions.JSONDecodeError``)
 - Fixed: `Issue #76 <https://github.com/maxtepkeev/python-redmine/issues/76>`__ (It was impossible
  to retrieve more than 100 resources for resources which don't support limit/offset natively by
  Redmine, i.e. this functionality is emulated by Python Redmine, e.g. WikiPage, Groups, Roles etc)

redmine/__init__.py

@@ -17,7 +17,8 @@
  ResourceNotFoundError,
  RequestEntityTooLargeError,
  UnknownError,
- ForbiddenError
+ ForbiddenError,
+ JSONDecodeError
 )
 
 
@@ -121,7 +122,10 @@ def request(self, method, url, headers=None, params=None, data=None, raw_respons
  elif not response.content.strip():
  return True
  else:
- return json_response(response.json)
+ try:
+ return json_response(response.json)
+ except (ValueError, TypeError):
+ raise JSONDecodeError
  elif response.status_code == 401:
  raise AuthError
  elif response.status_code == 403:

redmine/exceptions.py

@@ -162,3 +162,9 @@ class ForbiddenError(BaseRedmineError):
  """Requested resource is forbidden"""
  def __init__(self):
  super(ForbiddenError, self).__init__("Requested resource is forbidden")
+
+
+class JSONDecodeError(BaseRedmineError):
+ """Unable to decode received JSON"""
+ def __init__(self):
+ super(JSONDecodeError, self).__init__('Unable to decode received JSON, please check your server configuration')

tests/test_redmine.py

@@ -115,6 +115,12 @@ def test_conflict_error_exception(self):
  self.response.status_code = 409
  self.assertRaises(ConflictError, lambda: self.redmine.request('put', self.url))
 
+ def test_json_decode_error_exception(self):
+ from redmine.exceptions import JSONDecodeError
+ self.response.status_code = 200
+ self.response.json = mock.Mock(side_effect=ValueError)
+ self.assertRaises(JSONDecodeError, lambda: self.redmine.request('get', self.url))
+
  def test_auth_error_exception(self):
  from redmine.exceptions import AuthError
  self.response.status_code = 401