Merge pull request #2393 from davidovitch/use_stringIO_from_six

mdboom · mdboom · commit 04b8314bbd38 · 2013-09-09T10:38:30.000-07:00
use six.move for cStringIO
diff --git a/lib/matplotlib/backends/backend_ps.py b/lib/matplotlib/backends/backend_ps.py
@@ -1083,7 +1083,7 @@ def write(self, *kl, **kwargs):
 
             self._pswriter = NullWriter()
         else:
-            self._pswriter = io.StringIO()
+            self._pswriter = six.moves.cStringIO()
 
 
         # mixed mode rendering
@@ -1245,10 +1245,7 @@ def write(self, *kl, **kwargs):
 
             self._pswriter = NullWriter()
         else:
-            if six.PY3:
-                self._pswriter = io.StringIO()
-            else:
-                self._pswriter = cStringIO.StringIO()
+            self._pswriter = six.moves.cStringIO()
 
 
         # mixed mode rendering
diff --git a/lib/matplotlib/mathtext.py b/lib/matplotlib/mathtext.py
@@ -23,10 +23,7 @@
 
 import os, sys
 if six.PY3:
-    from io import StringIO
     unichr = chr
-else:
-    from cStringIO import StringIO
 from math import ceil
 try:
     set
@@ -245,7 +242,7 @@ class MathtextBackendPs(MathtextBackend):
     backend.
     """
     def __init__(self):
-        self.pswriter = StringIO()
+        self.pswriter = six.moves.cStringIO()
         self.lastfont = None
 
     def render_glyph(self, ox, oy, info):
@@ -1052,7 +1049,7 @@ def __init__(self, default_font_prop):
 
         self.fonts['default'] = default_font
         self.fonts['regular'] = default_font
-        self.pswriter = StringIO()
+        self.pswriter = six.moves.cStringIO()
 
     def _get_font(self, font):
         if font in self.fontmap:
