Merge remote-tracking branch 'upstream/v1.3.x'

Conflicts:
	lib/matplotlib/tests/test_backend_pdf.py

Author: mdboom

.travis.yml

@@ -36,4 +36,6 @@ script:
 
 after_failure:
   - cd ../matplotlib
-  - ./travis_upload.sh
+  - tar cjf result_images.tar.bz2 result_images
+  - travis-artifacts upload --path result_images.tar.bz2
+  - echo https://s3.amazonaws.com/matplotlib-test-results/artifacts/${TRAVIS_BUILD_NUMBER}/${TRAVIS_JOB_NUMBER}/result_images.tar.bz2

lib/matplotlib/backends/backend_pdf.py

@@ -2314,6 +2314,12 @@ def savefig(self, figure=None, **kwargs):
             else:
                 figureManager.canvas.figure.savefig(self, format='pdf', **kwargs)
 
+    def get_pagecount(self):
+        """
+        Returns the current number of pages in the multipage pdf file.
+        """
+        return len(self._file.pageList)
+
 class FigureCanvasPdf(FigureCanvasBase):
     """
     The canvas the figure renders into.  Calls the draw and print fig

lib/matplotlib/tests/__init__.py

@@ -15,6 +15,7 @@ def setup():
     # it during all of the tests.
     import locale
     import warnings
+    from matplotlib.backends import backend_agg, backend_pdf, backend_svg
 
     try:
         locale.setlocale(locale.LC_ALL, str('en_US.UTF-8'))
@@ -36,6 +37,12 @@ def setup():
     rcParams['text.hinting'] = False
     rcParams['text.hinting_factor'] = 8
 
+    # Clear the font caches.  Otherwise, the hinting mode can travel
+    # from one test to another.
+    backend_agg.RendererAgg._fontd.clear()
+    backend_pdf.RendererPdf.truetype_font_cache.clear()
+    backend_svg.RendererSVG.fontd.clear()
+
 
 def assert_str_equal(reference_str, test_str,
                      format_str=('String {str1} and {str2} do not '

lib/matplotlib/tests/test_backend_pdf.py

@@ -37,6 +37,16 @@ def test_type42():
     fig.savefig(io.BytesIO())
 
 
-if __name__ == "__main__":
-    import nose
-    nose.runmodule(argv=['-s', '--with-doctest'], exit=False)
+@cleanup
+def test_multipage_pagecount():
+    from matplotlib.backends.backend_pdf import PdfPages
+    from io import BytesIO
+    with PdfPages(BytesIO()) as pdf:
+        assert pdf.get_pagecount() == 0
+        fig = plt.figure()
+        ax = fig.add_subplot(111)
+        ax.plot([1, 2, 3])
+        fig.savefig(pdf, format="pdf")
+        assert pdf.get_pagecount() == 1
+        pdf.savefig()
+        assert pdf.get_pagecount() == 2