Merge pull request matplotlib#2106 from mdboom/identitytransform-bugfix

mdboom · mdboom · commit 15c7b9bbbd89 · 2013-07-02T14:03:09.000-07:00
Matplotlib 1.3.0rc2 test errors on win-amd64-py2.7
diff --git a/lib/matplotlib/tests/test_contour.py b/lib/matplotlib/tests/test_contour.py
@@ -3,6 +3,8 @@
 from matplotlib.testing.decorators import cleanup, image_comparison
 from matplotlib import pyplot as plt
 
+import re
+
 
 @cleanup
 def test_contour_shape_1d_valid():
@@ -97,14 +99,18 @@ def test_contour_shape_mismatch_4():
         ax.contour(b, g, z)
     except TypeError as exc:
         print exc.args[0]
-        assert exc.args[0] == 'Shape of x does not match that of z: ' + \
-                              'found (9, 9) instead of (9, 10).'
+        assert re.match(
+            r'Shape of x does not match that of z: ' +
+            r'found \(9L?, 9L?\) instead of \(9L?, 10L?\)\.',
+            exc.args[0]) is not None
 
     try:
         ax.contour(g, b, z)
     except TypeError as exc:
-        assert exc.args[0] == 'Shape of y does not match that of z: ' + \
-                              'found (9, 9) instead of (9, 10).'
+        assert re.match(
+            r'Shape of y does not match that of z: ' +
+            r'found \(9L?, 9L?\) instead of \(9L?, 10L?\)\.',
+            exc.args[0]) is not None
 
 
 @cleanup
@@ -157,23 +163,23 @@ def test_given_colors_levels_and_extends():
     _, axes = plt.subplots(2, 4)
 
     data = np.arange(12).reshape(3, 4)
-    
+
     colors = ['red', 'yellow', 'pink', 'blue', 'black']
     levels = [2, 4, 8, 10]
-    
+
     for i, ax in enumerate(axes.flatten()):
         plt.sca(ax)
-        
+
         filled = i % 2 == 0.
         extend = ['neither', 'min', 'max', 'both'][i // 2]
-        
+
         if filled:
             last_color = -1 if extend in ['min', 'max'] else None
             plt.contourf(data, colors=colors[:last_color], levels=levels, extend=extend)
         else:
             last_level = -1 if extend == 'both' else None
             plt.contour(data, colors=colors, levels=levels[:last_level], extend=extend)
-    
+
         plt.colorbar()
 
 
diff --git a/lib/matplotlib/tests/test_simplification.py b/lib/matplotlib/tests/test_simplification.py
@@ -152,7 +152,7 @@ def test_start_with_moveto():
     verts = np.fromstring(decodebytes(data), dtype='<i4')
     verts = verts.reshape((len(verts) / 2, 2))
     path = Path(verts)
-    segs = path.iter_segments(transforms.IdentityTransform, clip=(0.0, 0.0, 100.0, 100.0))
+    segs = path.iter_segments(transforms.IdentityTransform(), clip=(0.0, 0.0, 100.0, 100.0))
     segs = list(segs)
     assert len(segs) == 1
     assert segs[0][1] == Path.MOVETO
diff --git a/src/agg_py_transforms.cpp b/src/agg_py_transforms.cpp
@@ -31,8 +31,10 @@ py_to_agg_transformation_matrix(PyObject* obj, bool errors = true)
     try
     {
         matrix = (PyArrayObject*) PyArray_FromObject(obj, PyArray_DOUBLE, 2, 2);
-        if (!matrix)
+        if (!matrix) {
+            PyErr_Clear();
             throw std::exception();
+        }
     }
     catch (...)
     {

Original file line number	Diff line number	Diff line change
`@@ -31,8 +31,10 @@ py_to_agg_transformation_matrix(PyObject* obj, bool errors = true)`
`31`	`31`	`try`
`32`	`32`	`{`
`33`	`33`	`matrix = (PyArrayObject*) PyArray_FromObject(obj, PyArray_DOUBLE, 2, 2);`
`34`		`- if (!matrix)`
	`34`	`+ if (!matrix) {`
	`35`	`+ PyErr_Clear();`
`35`	`36`	`throw std::exception();`
	`37`	`+ }`
`36`	`38`	`}`
`37`	`39`	`catch (...)`
`38`	`40`	`{`