Avoid a JSONDecodeError when polling too earlier

Author: michelts

convertapi/client.py

@@ -1,5 +1,6 @@
 import requests
 import convertapi
+import simplejson
 
 from io import BytesIO
 from .exceptions import *
@@ -50,7 +51,10 @@ def handle_response(self, r):
 			except ValueError:
 				raise e
 
-		return r.json()
+		try:
+			return r.json()
+		except simplejson.errors.JSONDecodeError as e:
+			raise ApiError({'message': 'Conversion in progress'})
 
 	def url(self, path):
 		return "%s%s?Secret=%s" % (convertapi.base_uri, path, convertapi.api_secret)

tests/test_convertapi.py

@@ -101,6 +101,15 @@ def test_polling_of_invalid_job_id(self):
 		else:
 			raise AssertionError
 
+	def test_polling_too_fast_and_getting_202_accepted(self):
+		convert_result = convertapi.async_convert('pdf', { 'File': 'examples/files/test.docx' })
+		try:
+			convertapi.async_poll(convert_result.response['JobId'])
+		except convertapi.ApiError:
+			pass
+		else:
+			raise AssertionError
+
 
 def get_poll_result(job_id, retry_count=5):
 	try: