Use an explicit exception to tell the conversion is in progress

Author: michelts

convertapi/client.py

@@ -54,7 +54,7 @@ def handle_response(self, r):
 		try:
 			return r.json()
 		except simplejson.errors.JSONDecodeError as e:
-			raise ApiError({'message': 'Conversion in progress'})
+			raise AsyncConversionInProgress
 
 	def url(self, path):
 		return "%s%s?Secret=%s" % (convertapi.base_uri, path, convertapi.api_secret)

convertapi/exceptions.py

@@ -13,3 +13,7 @@ def __init__(self, result):
 	def __str__(self):
 		message = "%s Code: %s. %s" % (self.message, self.code, self.invalid_parameters)
 		return message.strip()
+
+
+class AsyncConversionInProgress(BaseError):
+	pass

tests/test_convertapi.py

@@ -105,7 +105,7 @@ 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:
+		except convertapi.AsyncConversionInProgress:
 			pass
 		else:
 			raise AssertionError
@@ -116,7 +116,7 @@ def test_polling_too_fast_and_getting_202_accepted(self):
 def get_poll_result(job_id, retry_count=5):
 	try:
 		result = convertapi.async_poll(job_id)
-	except convertapi.ApiError:
+	except convertapi.AsyncConversionInProgress:
 		if retry_count > 0:
 			time.sleep((1 + 0.1) ** (5 - retry_count) - 1)
 			return get_poll_result(job_id, retry_count=retry_count - 1)