grapher: add Pillow support, thanks to Miroslav Shubernetskiy (closes: #12)

diff --git a/timeside/grapher/core.py b/timeside/grapher/core.py
index c71d9deab0e3810ae94a8e7323c49a4f7d870584..f4acf385978f9009b0b965b70fbafbb307782ebf 100644 (file)
--- a/timeside/grapher/core.py
+++ b/timeside/grapher/core.py
@@ -23,11 +23,16 @@
 #   Guillaume Pellerin <yomguy@parisson.com>
 
 
-import optparse, math, sys
-import ImageFilter, ImageChops, Image, ImageDraw, ImageColor, ImageEnhance
-import numpy
+import optparse, math, sys, numpy
+
+try:
+    import ImageFilter, ImageChops, Image, ImageDraw, ImageColor, ImageEnhance
+except ImportError:
+    from PIL import ImageFilter, ImageChops, Image, ImageDraw, ImageColor, ImageEnhance
+
 from timeside.core import FixedSizeInputAdapter
 
+
 default_color_schemes = {
     'default': {
         'waveform': [(50,0,200), (0,220,80), (255,224,0), (255,0,0)],