Merge pull request #89 from srautiai/feature/replace-pillow

Feature/replace pillow

Author: Sakari Rautiainen

setup.py

@@ -11,7 +11,7 @@
       long_description="""\
 Testdroid API client for Python""",
       classifiers=['Operating System :: OS Independent',
-        'Topic :: Software Development', 
+        'Topic :: Software Development',
         'Intended Audience :: Developers'], # Get strings from http://pypi.python.org/pypi?%3Aaction=list_classifiers
       keywords='testdroid rest api client',
       author='Henri Kivelä <[email protected]>, Sakari Rautiainen <[email protected]>, Teppo Malinen <[email protected]>, Jarno Tuovinen <[email protected]>',
@@ -22,12 +22,12 @@
       include_package_data=True,
       zip_safe=True,
       install_requires=[
-         'requests', 'pillow',
+         'requests',
       ],
 
       entry_points = {
               'console_scripts': [
-                  'testdroid = testdroid:main',                  
+                  'testdroid = testdroid:main',
               ],
           },
       )

testdroid/__init__.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-import os, sys, requests, json, logging, time, base64
+import os, sys, requests, json, logging, time, base64, imghdr
 
 if sys.version_info[0] > 2:
     import http.client
@@ -684,15 +684,10 @@ def download_test_screenshots(self, project_id, test_run_id):
                         ''' Earlier downloaded images are checked, and if needed re-downloaded.
                         '''
                         try:
-                            from PIL import Image
-                            im=Image.open(full_path)
-                            im.verify()
-                            logger.info("Screenshot %s already exists - skipping download" % full_path)
-                        except ImportError:
-                            if os.path.isfile(full_path):  # fallback if Pillow fails to import
+                            if imghdr.what(full_path) in ['jpeg', 'png']:
                                 logger.info("Screenshot %s already exists - skipping download" % full_path)
                             else:
-                                raise # jump to next block
+                                raise
                         except:
                             url = "me/projects/%s/runs/%s/device-runs/%s/screenshots/%s" % (project_id, test_run['id'], device_run['id'], screenshot['id'])
                             prog = DownloadProgressBar()