Merge remote-tracking branch 'refs/remotes/tryggvib/532-exif-creation-date'

[mediagoblin.git] / mediagoblin / media_types / audio / transcoders.py

diff --git a/mediagoblin/media_types/audio/transcoders.py b/mediagoblin/media_types/audio/transcoders.py
index f3d49c309edf06b735f2cb0038432e31351bb5df..84e6af7e560e3d634e45d0c56000b6067dbabfe9 100644 (file)
--- a/mediagoblin/media_types/audio/transcoders.py
+++ b/mediagoblin/media_types/audio/transcoders.py
@@ -14,9 +14,11 @@
 # 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 pdb
 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
@@ -233,5 +235,3 @@ if __name__ == '__main__':
     thumbnailer = AudioThumbnailer()
 
     thumbnailer.spectrogram(*sys.argv[1:], width=640)
-
-    pdb.set_trace()