Adjust timeout param naming

Author: Laurynas Butkus

convertapi/api.py

@@ -1,5 +1,5 @@
 from .task import Task
 
-def convert(to_format, params, from_format = None, conversion_timeout = None):
-    task = Task(from_format, to_format, params, conversion_timeout = conversion_timeout)
+def convert(to_format, params, from_format = None, timeout = None):
+    task = Task(from_format, to_format, params, timeout = timeout)
     return task.run()

convertapi/task.py

@@ -6,21 +6,21 @@
 DEFAULT_URL_FORMAT = 'url'
 
 class Task:
-    def __init__(self, from_format, to_format, params, conversion_timeout = None):
+    def __init__(self, from_format, to_format, params, timeout = None):
         self.from_format = from_format
         self.to_format = to_format
         self.params = params
-        self.conversion_timeout = conversion_timeout or convertapi.conversion_timeout
+        self.timeout = timeout or convertapi.conversion_timeout
 
         self.default_params = {
-            'Timeout': self.conversion_timeout,
+            'Timeout': self.timeout,
             'StoreFile': True,
         }
 
     def run(self):
         params = self.__normalize_params()
         from_format = self.from_format or self.__detect_format()
-        timeout = self.conversion_timeout + convertapi.conversion_timeout_delta
+        timeout = self.timeout + convertapi.conversion_timeout_delta
         path = "convert/%s/to/%s" % (from_format, self.to_format)
 
         response = convertapi.client.post(path, params, timeout = timeout)

tests/test_convertapi.py

@@ -26,6 +26,10 @@ def test_convert_url(self):
 		result = convertapi.convert('pdf', { 'Url': 'http://convertapi.com' })
 		assert result.conversion_cost > 0
 
+	def test_convert_url_with_timeout_and_format(self):
+		result = convertapi.convert('pdf', { 'Url': 'https://www.w3.org/TR/PNG/iso_8859-1.txt' }, 'web', 100)
+		assert result.conversion_cost > 0
+
 	def test_upload_io(self):
 		bytes_io = io.BytesIO(b'test')
 		upload_io = convertapi.UploadIO(bytes_io, 'test.txt')
@@ -36,3 +40,8 @@ def test_zip_files(self):
 		files = ['examples/files/test.docx', 'examples/files/test.docx']
 		result = convertapi.convert('zip', { 'Files': files })
 		assert result.conversion_cost > 0
+
+	def test_chained_conversion(self):
+		result = convertapi.convert('pdf', { 'File': 'examples/files/test.docx' })
+		zip_result = convertapi.convert('zip', { 'Files': result.files })
+		eq_('test.zip', zip_result.file.filename)