Merge lp:~garyvdm/nautilus-image-manipulator/pillow-compat into lp:nautilus-image-manipulator

[Gary van der Merwe]

This adds compatibility with Pillow >= 1.0 . It still works with the original PIL.

See http://pillow.readthedocs.org/en/latest/installation.html

Unmerged revisions

241. By Gary van der Merwe on 2014-01-04

Add compatibity with Pillow >= 1.0

=== modified file 'CHANGELOG'
--- CHANGELOG	2013-04-19 18:59:16 +0000
+++ CHANGELOG	2014-01-04 11:34:41 +0000
@@ -1,6 +1,10 @@
 Changelog for nautilus-image-manipulator
 
 ================================
+1.4 - Unreleased
+  * Compatibility with Pillow >= 1.0. 
+
+================================
 1.3 - 2013-04-19 (r240)
   * We now have a logo!
   * Add dl.free.fr as upload destination (LP #1098695)
 
=== modified file 'nautilus_image_manipulator/ImageManipulations.py'
--- nautilus_image_manipulator/ImageManipulations.py	2013-03-20 21:52:45 +0000
+++ nautilus_image_manipulator/ImageManipulations.py	2014-01-04 11:34:41 +0000
@@ -19,7 +19,7 @@
 from gi.repository import GObject
 import zipfile
 import subprocess
-import Image
+from PIL import Image
 import logging
 try:
     from gi.repository import GExiv2