From 352a1807659b0977c0ccdb8d4bad64aa4f5b5277 Mon Sep 17 00:00:00 2001
From: Joar Wandborg <git@wandborg.com>
Date: Tue, 27 Mar 2012 23:43:15 +0200
Subject: [PATCH] Changed audio.* Image* imports

so that they no longer import from PIL explicitly.
This is due to explicit PIL.Image* imports failing
on a Ubuntu machine within virtualenv.

PIL is a mystery I have yet to find the energy to unravel.

The 'implicit' approach works both for the affected
machine and my local machine and I've seen it more often
out in the wild, so I'm assuming it is the right way.
---
 extlib/freesound/audioprocessing.py          | 2 +-
 mediagoblin/media_types/audio/transcoders.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/extlib/freesound/audioprocessing.py b/extlib/freesound/audioprocessing.py
index 2c2b35b5..c1dfe2eb 100644
--- a/extlib/freesound/audioprocessing.py
+++ b/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>
 
-from PIL import Image, ImageDraw, ImageColor #@UnresolvedImport
+import Image, ImageDraw, ImageColor #@UnresolvedImport
 from functools import partial
 import math
 import numpy
diff --git a/mediagoblin/media_types/audio/transcoders.py b/mediagoblin/media_types/audio/transcoders.py
index f84ab7f2..be80aa0e 100644
--- a/mediagoblin/media_types/audio/transcoders.py
+++ b/mediagoblin/media_types/audio/transcoders.py
@@ -16,7 +16,7 @@
 
 import pdb
 import logging
-from PIL import Image
+import Image
 
 from mediagoblin.processing import BadMediaFail
 from mediagoblin.media_types.audio import audioprocessing