PIL: Support systems with Pillow and without

Fixes for systems with Pillow, but leaves a "try: except ImportError" to
support anything that doesn't have a PIL top level import.

Signed-off-by: Alon Levy <alon@pobox.com>

extlib/freesound/audioprocessing.py

@@ -20,7 +20,7 @@
 #   Bram de Jong <bram.dejong at domain.com where domain in gmail>
 #   2012, Joar Wandborg <first name at last name dot se>
 
-import Image, ImageDraw, ImageColor #@UnresolvedImport
+from PIL import Image, ImageDraw, ImageColor #@UnresolvedImport
 from functools import partial
 import math
 import numpy

mediagoblin/media_types/ascii/asciitoimage.py

@@ -14,9 +14,14 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-import Image
+try:
-import ImageFont
+    from PIL import Image
-import ImageDraw
+    from PIL import ImageFont
+    from PIL import ImageDraw
+except ImportError:
+    import Image
+    import ImageFont
+    import ImageDraw
 import logging
 import pkg_resources
 import os

mediagoblin/media_types/ascii/processing.py

@@ -15,7 +15,10 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 import chardet
 import os
-import Image
+try:
+    from PIL import Image
+except ImportError:
+    import Image
 import logging
 
 from mediagoblin import mg_globals as mgg
@@ -42,7 +45,7 @@ def process_ascii(proc_state):
     """Code to process a txt file. Will be run by celery.
 
     A Workbench() represents a local tempory dir. It is automatically
-    cleaned up when this function exits. 
+    cleaned up when this function exits.
     """
     entry = proc_state.entry
     workbench = proc_state.workbench

mediagoblin/media_types/audio/spectrogram.py

@@ -19,7 +19,10 @@
 #   Bram de Jong <bram.dejong at domain.com where domain in gmail>
 #   2012, Joar Wandborg <first name at last name dot se>
 
-from PIL import Image
+try:
+    from PIL import Image
+except ImportError:
+    import Image
 import math
 import numpy
 

mediagoblin/media_types/audio/transcoders.py

@@ -15,7 +15,10 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import logging
-import Image
+try:
+    from PIL import Image
+except ImportError:
+    import Image
 
 from mediagoblin.processing import BadMediaFail
 from mediagoblin.media_types.audio import audioprocessing

mediagoblin/media_types/image/processing.py

@@ -14,7 +14,10 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-import Image
+try:
+    from PIL import Image
+except ImportError:
+    import Image
 import os
 import logging
 

mediagoblin/media_types/video/transcoders.py

@@ -26,7 +26,10 @@ import pygst
 pygst.require('0.10')
 import gst
 import struct
-import Image
+try:
+    from PIL import Image
+except ImportError:
+    import Image
 
 from gst.extend import discoverer
 

mediagoblin/tests/test_exif.py

@@ -15,7 +15,10 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import os
-import Image
+try:
+    from PIL import Image
+except ImportError:
+    import Image
 
 from mediagoblin.tools.exif import exif_fix_image_orientation, \
     extract_exif, clean_exif, get_gps_data, get_useful