Fix a number of common bugs revealed by the regression tests.

mdboom · mdboom · commit 05243f9fad9b · 2011-02-28T12:59:54.000-05:00
diff --git a/lib/matplotlib/backends/backend_svg.py b/lib/matplotlib/backends/backend_svg.py
@@ -289,7 +289,7 @@ def draw_path_collection(self, gc, master_transform, paths, all_transforms,
             transform = Affine2D(transform.get_matrix()).scale(1.0, -1.0)
             d = self._convert_path(path, transform, simplify=False)
             name = u'coll%x_%x_%s' % (self._path_collection_id, i,
-                                     md5(d).hexdigest())
+                                      md5(d.encode('ascii')).hexdigest())
             write(u'<path id="%s" d="%s"/>\n' % (name, d))
             path_codes.append(name)
         write(u'</defs>\n')
@@ -433,7 +433,7 @@ def draw_image(self, gc, x, y, im):
             _png.write_png(buffer, cols, rows, bytesio)
             im.flipud_out()
             self._svgwriter.write(
-                base64.encodestring(bytesio.getvalue()).decode('ascii'))
+                base64.encodebytes(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/cbook.py b/lib/matplotlib/cbook.py
@@ -40,9 +40,20 @@
 except (ValueError, ImportError, AttributeError):
     preferredencoding = None
 
-def unicode_safe(s):
-    if preferredencoding is None: return unicode(s)
-    else: return unicode(s, preferredencoding)
+if sys.version_info[0] >= 3:
+    def unicode_safe(s):
+        if isinstance(s, bytes):
+            if preferredencoding is None:
+                return unicode(s)
+            else:
+                # We say "unicode" and not "str" here so it passes through
+                # 2to3 correctly.
+                return unicode(s, preferredencoding)
+        return s
+else:
+    def unicode_safe(s):
+        if preferredencoding is None: return unicode(s)
+        else: return unicode(s, preferredencoding)
 
 
 class converter:
diff --git a/src/_image.cpp b/src/_image.cpp
@@ -200,8 +200,13 @@ Image::as_rgba_str(const Py::Tuple& args, const Py::Dict& kwargs)
 
     std::pair<agg::int8u*, bool> bufpair = _get_output_buffer();
 
+    #if PY3K
+    Py::Object ret =  Py::asObject(Py_BuildValue("lly#", rowsOut, colsOut,
+                                   bufpair.first, colsOut * rowsOut * 4));
+    #else
     Py::Object ret =  Py::asObject(Py_BuildValue("lls#", rowsOut, colsOut,
                                    bufpair.first, colsOut * rowsOut * 4));
+    #endif
 
     if (bufpair.second) delete [] bufpair.first;
     return ret;
diff --git a/src/_png.cpp b/src/_png.cpp
@@ -67,8 +67,13 @@ static void write_png_data(png_structp png_ptr, png_bytep data, png_size_t lengt
     PyObject* result = NULL;
     if (write_method)
     {
+        #if PY3K
+        result = PyObject_CallFunction(write_method, (char *)"y#", data,
+                                       length);
+        #else
         result = PyObject_CallFunction(write_method, (char *)"s#", data,
                                        length);
+        #endif
     }
     Py_XDECREF(write_method);
     Py_XDECREF(result);

Original file line number	Diff line number	Diff line change
`@@ -67,8 +67,13 @@ static void write_png_data(png_structp png_ptr, png_bytep data, png_size_t lengt`
`67`	`67`	`PyObject* result = NULL;`
`68`	`68`	`if (write_method)`
`69`	`69`	`{`
	`70`	`+ #if PY3K`
	`71`	`+ result = PyObject_CallFunction(write_method, (char *)"y#", data,`
	`72`	`+ length);`
	`73`	`+ #else`
`70`	`74`	`result = PyObject_CallFunction(write_method, (char *)"s#", data,`
`71`	`75`	`length);`
	`76`	`+ #endif`
`72`	`77`	`}`
`73`	`78`	`Py_XDECREF(write_method);`
`74`	`79`	`Py_XDECREF(result);`