Merge pull request #5171 from cgohlke/patch-11

tacaswell · tacaswell · commit f39caf1f2357 · 2015-10-02T21:15:04.000-04:00
Fix exception with Pillow 3
diff --git a/examples/pylab_examples/agg_buffer.py b/examples/pylab_examples/agg_buffer.py
@@ -4,6 +4,8 @@
 convert it to an array and pass it to Pillow for rendering.
 """
 
+import numpy as np
+
 import matplotlib.pyplot as plt
 from matplotlib.backends.backend_agg import FigureCanvasAgg
 
@@ -28,7 +30,10 @@
 X = np.fromstring(s, np.uint8)
 X.shape = h, w, 3
 
-im = Image.fromstring("RGB", (w, h), s)
+try:
+    im = Image.fromstring("RGB", (w, h), s)
+except Exception:
+    im = Image.frombytes("RGB", (w, h), s)
 
 # Uncomment this line to display the image using ImageMagick's
 # `display` tool.
