merged mdboom's changes

Author: jrjohansson

lib/matplotlib/backends/backend_cairo.py

@@ -200,7 +200,10 @@ def draw_text(self, gc, x, y, s, prop, angle, ismath=False):
            if angle:
               ctx.rotate (-angle * np.pi / 180)
            ctx.set_font_size (size)
-           ctx.show_text (s.encode("utf-8"))
+           if sys.version_info[0] < 3:
+              ctx.show_text (s.encode("utf-8"))
+           else:
+              ctx.show_text (s)
            ctx.restore()
 
     def _draw_mathtext(self, gc, x, y, s, prop, angle):

lib/matplotlib/backends/backend_gtk3agg.py

@@ -1,11 +1,16 @@
 import cairo
 import numpy as np
+import sys
+import warnings
 
 import backend_agg
 import backend_gtk3
 from matplotlib.figure import Figure
 from matplotlib import transforms
 
+if sys.version_info[0] >= 3:
+    warnings.warn("The Gtk3Agg backend is not known to work on Python 3.x.")
+
 
 class FigureCanvasGTK3Agg(backend_gtk3.FigureCanvasGTK3,
                           backend_agg.FigureCanvasAgg):

src/_backend_agg.cpp

@@ -178,7 +178,12 @@ BufferRegion::to_string_argb(const Py::Tuple &args)
         }
     }
 
-    return Py::String(str, true);
+    #if PY3K
+    return Py::Bytes
+    #else
+    return Py::String
+    #endif
+        (str, true);
 }