Do not use multiprocessing if max_parallel_uploads is less than 2

Author: Laurynas Butkus

convertapi/utils.py

@@ -1,6 +1,9 @@
 import multiprocessing
 
 def map_in_parallel(f, values, pool_size):
+    if pool_size < 2:
+        return map(f, values)
+
     pool = multiprocessing.Pool(pool_size)
     results = pool.map_async(f, values)
     pool.close()

tests/test_convertapi.py

@@ -10,6 +10,7 @@
 class TestConvertapi(utils.TestCase):
 	def setUp(self):
 		convertapi.api_secret = os.environ['CONVERT_API_SECRET']
+		convertapi.max_parallel_uploads = 10
 
 	def test_defaults(self):
 		eq_('https://v2.convertapi.com/', convertapi.base_uri)
@@ -23,6 +24,11 @@ def test_convert_file(self):
 		assert result.save_files(tempfile.gettempdir())
 		assert result.conversion_cost > 0
 
+	def test_convert_file_no_parallelizm(self):
+		convertapi.max_parallel_uploads = 1
+		result = convertapi.convert('pdf', { 'File': 'examples/files/test.docx' })
+		assert result.save_files(tempfile.gettempdir())
+
 	def test_convert_file_alternative(self):
 		result = convertapi.convert('pdf', { 'File': 'examples/files/test.docx', 'converter': 'openoffice' })
 		assert result.save_files(tempfile.gettempdir())