Merge remote-tracking branch 'upstream/v1.2.x' into v1.3.x

mdboom · mdboom · commit 567befa53a4b · 2013-06-03T10:58:30.000-04:00
diff --git a/lib/matplotlib/cbook.py b/lib/matplotlib/cbook.py
@@ -1173,8 +1173,10 @@ def pieces(seq, num=2):
 
 
 def exception_to_str(s=None):
-
-    sh = io.StringIO()
+    if sys.version_info[0] < 3:
+        sh = io.BytesIO()
+    else:
+        sh = io.StringIO()
     if s is not None:
         print(s, file=sh)
     traceback.print_exc(file=sh)
