Do not set default conversion timeout

Author: Laurynas Butkus

convertapi/__init__.py

@@ -11,10 +11,10 @@
 base_uri = 'https://v2.convertapi.com/'
 user_agent = 'ConvertAPI-Python/' + __version__
 timeout = 60
-conversion_timeout = 180
+conversion_timeout = None
 conversion_timeout_delta = 10
-upload_timeout = 600
-download_timeout = 600
+upload_timeout = 1800
+download_timeout = 1800
 max_parallel_uploads = 10
 
 client = Client()

convertapi/task.py

@@ -20,7 +20,7 @@ def __init__(self, from_format, to_format, params, timeout = None):
     def run(self):
         params = self.__normalize_params()
         from_format = self.from_format or self.__detect_format()
-        timeout = self.timeout + convertapi.conversion_timeout_delta
+        timeout = self.timeout + convertapi.conversion_timeout_delta if self.timeout else None
         path = "convert/%s/to/%s" % (from_format, self.to_format)
 
         if 'converter' in params:

tests/test_convertapi.py

@@ -68,7 +68,8 @@ def test_chained_conversion(self):
 
 	@raises(convertapi.ApiError)
 	def test_api_error(self):
-		convertapi.convert('pdf', { 'Url': 'https://www.w3.org/TR/PNG/iso_8859-1.txt' }, 'web', 600)
+		convertapi.api_secret = 'TEST'
+		convertapi.convert('pdf', { 'Url': 'https://www.w3.org/TR/PNG/iso_8859-1.txt' })
 
 	def test_user_info(self):
 		user_info = convertapi.user()