Merge branch 'v1.4.x' into master

tacaswell · tacaswell · commit d84b16e3ef4c · 2014-12-31T18:16:59.000-05:00
Conflicts:
	lib/matplotlib/tests/test_ticker.py
	src/_backend_agg.cpp

test_ticker.py:
   white space conflicts

_backend_agg.cpp:
   Discarded all changes from v1.4.x due to the massive refactor, test
   works with out seg-faulting.
diff --git a/lib/matplotlib/tests/test_agg.py b/lib/matplotlib/tests/test_agg.py
@@ -131,6 +131,19 @@ def report_memory(i):
 ##     # w/ text and w/ write_png  : Average memory consumed per loop: 0.32
 
 
+@cleanup
+def test_marker_with_nan():
+    # This creates a marker with nans in it, which was segfaulting the
+    # Agg backend (see #3722)
+    fig, ax = plt.subplots(1)
+    steps = 1000
+    data = np.arange(steps)
+    ax.semilogx(data)
+    ax.fill_between(data, data*0.8, data*1.2)
+    buf = io.BytesIO()
+    fig.savefig(buf, format='png')
+
+
 if __name__ == "__main__":
     import nose
     nose.runmodule(argv=['-s', '--with-doctest'], exit=False)
diff --git a/lib/matplotlib/tests/test_ticker.py b/lib/matplotlib/tests/test_ticker.py
@@ -11,6 +11,7 @@
 import matplotlib.ticker as mticker
 from matplotlib.testing.decorators import cleanup
 
+
 def test_MaxNLocator():
     loc = mticker.MaxNLocator(nbins=5)
     test_value = np.array([20., 40., 60., 80., 100.])
