Update the backend tests with the new rcParam name 'image.combine_images'

breedlun · breedlun · commit d3f416d35b1f · 2015-02-20T23:30:16.000-07:00
diff --git a/lib/matplotlib/tests/test_backend_pdf.py b/lib/matplotlib/tests/test_backend_pdf.py
@@ -99,19 +99,11 @@ def test_combine_images():
     ax.set_xlim(0, 3)
     ax.imshow(Z, extent=[0, 1, 0, 1])
     ax.imshow(Z[::-1], extent=[2, 3, 0, 1])
-<<<<<<< HEAD
     plt.rcParams['image.combine_images'] = True
     with PdfPages(io.BytesIO()) as pdf:
         fig.savefig(pdf, format="pdf")
         assert len(pdf._file.images.keys()) == 1
     plt.rcParams['image.combine_images'] = False
-=======
-    plt.rcParams['vector_backends.combine_images'] = True
-    with PdfPages(io.BytesIO()) as pdf:
-        fig.savefig(pdf, format="pdf")
-        assert len(pdf._file.images.keys()) == 1
-    plt.rcParams['vector_backends.combine_images'] = False
->>>>>>> Added the rcParams 'pdf.combine_images', 'svg.combine_images', and
     with PdfPages(io.BytesIO()) as pdf:
         fig.savefig(pdf, format="pdf")
         assert len(pdf._file.images.keys()) == 2
diff --git a/lib/matplotlib/tests/test_backend_ps.py b/lib/matplotlib/tests/test_backend_ps.py
@@ -97,21 +97,13 @@ def test_combine_images():
     ax.set_xlim(0, 3)
     ax.imshow(Z, extent=[0, 1, 0, 1])
     ax.imshow(Z[::-1], extent=[2, 3, 0, 1])
-<<<<<<< HEAD
     plt.rcParams['image.combine_images'] = True
-=======
-    plt.rcParams['vector_backends.combine_images'] = True
->>>>>>> Added the rcParams 'pdf.combine_images', 'svg.combine_images', and
     with io.BytesIO() as ps:
         fig.savefig(ps, format="ps")
         ps.seek(0)
         buff = ps.read()
         assert buff.count(six.b(' colorimage')) == 1
-<<<<<<< HEAD
     plt.rcParams['image.combine_images'] = False
-=======
-    plt.rcParams['vector_backends.combine_images'] = False
->>>>>>> Added the rcParams 'pdf.combine_images', 'svg.combine_images', and
     with io.BytesIO() as ps:
         fig.savefig(ps, format="ps")
         ps.seek(0)
diff --git a/lib/matplotlib/tests/test_backend_svg.py b/lib/matplotlib/tests/test_backend_svg.py
@@ -66,21 +66,13 @@ def test_combine_images():
     ax.set_xlim(0, 3)
     ax.imshow(Z, extent=[0, 1, 0, 1])
     ax.imshow(Z[::-1], extent=[2, 3, 0, 1])
-<<<<<<< HEAD
     plt.rcParams['image.combine_images'] = True
-=======
-    plt.rcParams['vector_backends.combine_images'] = True
->>>>>>> Added the rcParams 'pdf.combine_images', 'svg.combine_images', and
     with BytesIO() as svg:
         fig.savefig(svg, format="svg")
         svg.seek(0)
         buff = svg.read()
         assert buff.count(six.b('<image ')) == 1
-<<<<<<< HEAD
     plt.rcParams['image.combine_images'] = False
-=======
-    plt.rcParams['vector_backends.combine_images'] = False
->>>>>>> Added the rcParams 'pdf.combine_images', 'svg.combine_images', and
     with BytesIO() as svg:
         fig.savefig(svg, format="svg")
         svg.seek(0)
