merged mdboom's changes

jrjohansson · jrjohansson · commit 6afab091571f · 2011-11-21T13:56:36.000+09:00
diff --git a/lib/matplotlib/backends/backend_cairo.py b/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):
diff --git a/lib/matplotlib/backends/backend_gtk3agg.py b/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):
diff --git a/src/_backend_agg.cpp b/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);
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -178,7 +178,12 @@ BufferRegion::to_string_argb(const Py::Tuple &args)`
`178`	`178`	`}`
`179`	`179`	`}`
`180`	`180`
`181`		`- return Py::String(str, true);`
	`181`	`+ #if PY3K`
	`182`	`+ return Py::Bytes`
	`183`	`+ #else`
	`184`	`+ return Py::String`
	`185`	`+ #endif`
	`186`	`+ (str, true);`
`182`	`187`	`}`
`183`	`188`
`184`	`189`