A few minor changes to get the regression tests working in Python 2.7

mdboom · mdboom · commit db2539100f24 · 2011-02-25T12:33:10.000-05:00
diff --git a/lib/matplotlib/backends/backend_svg.py b/lib/matplotlib/backends/backend_svg.py
@@ -432,7 +432,8 @@ def draw_image(self, gc, x, y, im):
             rows, cols, buffer = im.as_rgba_str()
             _png.write_png(buffer, cols, rows, bytesio)
             im.flipud_out()
-            self._svgwriter.write(base64.encodestring(bytesio.getvalue()))
+            self._svgwriter.write(
+                base64.encodestring(bytesio.getvalue()).decode('ascii'))
         else:
             self._imaged[self.basename] = self._imaged.get(self.basename,0) + 1
             filename = '%s.image%d.png'%(self.basename, self._imaged[self.basename])
diff --git a/lib/matplotlib/tests/test_backend_svg.py b/lib/matplotlib/tests/test_backend_svg.py
@@ -1,6 +1,7 @@
 import matplotlib.pyplot as plt
 import numpy as np
-import io
+import sys
+from io import BytesIO
 import xml.parsers.expat
 from matplotlib.testing.decorators import knownfailureif
 
@@ -18,7 +19,7 @@ def test_visibility():
     for artist in b:
         artist.set_visible(False)
 
-    fd = io.StringIO()
+    fd = BytesIO()
     fig.savefig(fd,format='svg')
 
     fd.seek(0)
diff --git a/lib/matplotlib/tests/test_image.py b/lib/matplotlib/tests/test_image.py
@@ -53,7 +53,7 @@ def test_image_python_io():
     fig = plt.figure()
     ax = fig.add_subplot(111)
     ax.plot([1,2,3])
-    buffer = io.StringIO()
+    buffer = io.BytesIO()
     fig.savefig(buffer)
     buffer.seek(0)
     plt.imread(buffer)
@@ -79,10 +79,10 @@ def test_imsave():
     random.seed(1)
     data = random.rand(256, 128)
 
-    buff_dpi1 = io.StringIO()
+    buff_dpi1 = io.BytesIO()
     plt.imsave(buff_dpi1, data, dpi=1)
 
-    buff_dpi100 = io.StringIO()
+    buff_dpi100 = io.BytesIO()
     plt.imsave(buff_dpi100, data, dpi=100)
 
     buff_dpi1.seek(0)
