Jun 8, 2012 · Feb 28, 2012 · Mar 6, 2012 · Mar 6, 2012 · Mar 20, 2012 · Apr 20, 2012
diff --git a/lib/matplotlib/backends/backend_svg.py b/lib/matplotlib/backends/backend_svg.py

        writer.start(u'defs')
        for i in range(3):
            x1, y1 =points[i]
            x2, y2 =points[(i + 1) % 3]
            x3, y3 =points[(i + 2) % 3]
            x1, y1 =tpoints[i]
            x2, y2 =tpoints[(i + 1) % 3]
            x3, y3 =tpoints[(i + 2) % 3]
            c = colors[i][:]

            if x2 == x3:
diff --git a/lib/matplotlib/collections.py b/lib/matplotlib/collections.py
        self._set_gc_clip(gc)
        gc.set_snap(self.get_snap())

        if self._hatch:
            gc.set_hatch(self._hatch)

        renderer.draw_path_collection(
            gc, transform.frozen(), paths, self.get_transforms(),
            offsets, transOffset, self.get_facecolor(), self.get_edgecolor(),
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/scatter.png b/lib/matplotlib/tests/baseline_images/test_axes/scatter.png
diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py
    ax.set_xticks([])
    ax.set_yticks([])

 <<<<<<< HEAD
 @image_comparison(baseline_images=['hist_log'])
 def test_hist_log():
    data0 = np.linspace(0,1,200)**3
diff --git a/lib/matplotlib/tests/test_figure.py b/lib/matplotlib/tests/test_figure.py
    plt.close('all')
    plt.figure('today')
    plt.figure(3)
    plt.figure('tomorow')
    plt.figure('tomorrow')
    plt.figure()
    plt.figure(0)
    plt.figure(1)
    plt.figure(3)
    assert_equal(plt.get_fignums(), [0, 1, 3, 4, 5])
    assert_equal(plt.get_figlabels(), ['', 'today', '', 'tomorow', ''])
    assert_equal(plt.get_figlabels(), ['', 'today', '', 'tomorrow', ''])
    plt.close(10)
    plt.close()
    plt.close(5)
    plt.close('tomorow')
    plt.close('tomorrow')
    assert_equal(plt.get_fignums(), [0, 1])
    assert_equal(plt.get_figlabels(), ['', 'today'])

    ax.set_title(fig.get_label())
    ax.plot(range(5))
    # plot red line in a different figure.
    plt.figure('tomorow')
    plt.figure('tomorrow')
    plt.plot([0, 1], [1,0], 'r')
    # Return to the original; make sure the red line is not there.
    plt.figure('today')
    plt.close('tomorrow')
Original file line number	Diff line number	Diff line change
Expand Up		@@ -657,9 +657,9 @@ def draw_gouraud_triangle(self, gc, points, colors, trans):

		writer.start(u'defs')
		for i in range(3):
		x1, y1 =points[i]
		x2, y2 =points[(i + 1) % 3]
		x3, y3 =points[(i + 2) % 3]
		x1, y1 =tpoints[i]
Copy link MemberAuthor pelsonJun 7, 2012 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. This bug came out in the pcolor test (the pcolor was not in the correct place). I don't understand how it wasn't failing before, but the fact that the bug has been highlighted by this PR is a good sign.
		x2, y2 =tpoints[(i + 1) % 3]
		x3, y3 =tpoints[(i + 2) % 3]
		c = colors[i][:]

		if x2 == x3:
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -242,6 +242,9 @@ def draw(self, renderer):
		self._set_gc_clip(gc)
		gc.set_snap(self.get_snap())

		if self._hatch:
		gc.set_hatch(self._hatch)

		renderer.draw_path_collection(
		gc, transform.frozen(), paths, self.get_transforms(),
		offsets, transOffset, self.get_facecolor(), self.get_edgecolor(),
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -650,7 +650,6 @@ def test_marker_edges():
		ax.set_xticks([])
		ax.set_yticks([])

		<<<<<<< HEAD
		@image_comparison(baseline_images=['hist_log'])
		def test_hist_log():
		data0 = np.linspace(0,1,200)**3
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -10,17 +10,17 @@ def test_figure_label():
		plt.close('all')
		plt.figure('today')
		plt.figure(3)
		plt.figure('tomorow')
		plt.figure('tomorrow')
		plt.figure()
		plt.figure(0)
		plt.figure(1)
		plt.figure(3)
		assert_equal(plt.get_fignums(), [0, 1, 3, 4, 5])
		assert_equal(plt.get_figlabels(), ['', 'today', '', 'tomorow', ''])
		assert_equal(plt.get_figlabels(), ['', 'today', '', 'tomorrow', ''])
		plt.close(10)
		plt.close()
		plt.close(5)
		plt.close('tomorow')
		plt.close('tomorrow')
		assert_equal(plt.get_fignums(), [0, 1])
		assert_equal(plt.get_figlabels(), ['', 'today'])

Expand All		@@ -33,7 +33,8 @@ def test_figure():
		ax.set_title(fig.get_label())
		ax.plot(range(5))
		# plot red line in a different figure.
		plt.figure('tomorow')
		plt.figure('tomorrow')
		plt.plot([0, 1], [1,0], 'r')
		# Return to the original; make sure the red line is not there.
		plt.figure('today')
		plt.close('tomorrow')
Copy link MemberAuthor pelsonJun 7, 2012 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. I was getting a failing test here because I was comparing the "tomorrow" figure rather than the "today" one. I assume this is related to dictionary ordering of figures, but I don't know for sure.