python3 compability fixes

Author: josiasmontag

.travis.yml

@@ -4,6 +4,7 @@ python:
   - "3.2"
   - "3.3"
   - "3.4"
+  - "3.5"
 install:
   - pip install .
   - pip install -r requirements-dev.txt

cloudconvert/api.py

@@ -1,5 +1,12 @@
 import json
-import urllib
+
+try:
+    from urllib.parse import quote, unquote
+except ImportError:
+    from urllib import quote, unquote
+
+
+import io
 
 from requests import request, Session
 from requests.exceptions import RequestException
@@ -103,16 +110,24 @@ def rawCall(self, method, path, content=None, is_authenticated=False, stream=Fal
 
             ## check if we upload anything
             isupload = False
+
+            try:
+               fileInstance=file # python 2
+            except NameError:
+               fileInstance=io.BufferedReader # python 3
+
             for key, value in content.items():
-                if isinstance(value, file):
+                if key == 'file':
+                    x= ""
+                if isinstance(value, fileInstance):
                     ## if it is file: remove from content dict and add it to files dict
                     isupload = True
                     files = {key: value}
                     del content[key]
                     break
 
             if isupload:
-                url += "?" + urllib.unquote(urlencode(content))
+                url += "?" + unquote(urlencode(content))
             else:
                 headers['Content-type'] = 'application/json'
                 body = json.dumps(content)

tests/test_process.py

@@ -51,7 +51,7 @@ def test_02_if_process_with_input_upload_works(self):
             'input': 'upload',
             'outputformat': 'jpg',
             'wait': True,
-            'file': open('input.png', 'rb')
+            'file': open('tests/input.png', 'rb')
         })
         self.assertEqual(process['step'],'finished')
         self.assertEqual(process['output']['ext'],'jpg')
@@ -70,7 +70,7 @@ def test_03_if_process_with_input_upload_and_custom_options_works(self):
             'input': 'upload',
             'outputformat': 'jpg',
             'wait': True,
-            'file': open('input.png', 'rb'),
+            'file': open('tests/input.png', 'rb'),
             'converteroptions': {
                 'quality': 10
             }
@@ -92,7 +92,7 @@ def test_04_if_download_of_output_file_works(self):
         process.start({
             'input': 'upload',
             'outputformat': 'pdf',
-            'file': open('input.png', 'rb')
+            'file': open('tests/input.png', 'rb')
         })
         process.wait()
         process.download("output.pdf")
@@ -112,7 +112,7 @@ def test_05_if_download_of_multiple_output_file_works(self):
         process.start({
             'input': 'upload',
             'outputformat': 'jpg',
-            'file': open('input.pdf', 'rb'),
+            'file': open('tests/input.pdf', 'rb'),
             'converteroptions': {
                 'page_range': '1-2'
             }
@@ -134,7 +134,7 @@ def test_06_if_convert_shortcut_works(self):
             'inputformat': 'png',
             'outputformat': 'jpg',
             'input': 'upload',
-            'file': open('input.png', 'rb')
+            'file': open('tests/input.png', 'rb')
         }).wait()
         self.assertEqual(process['step'],'finished')
         self.assertEqual(process['output']['ext'],'jpg')