Commita6f881a

committed

Merge branch 'v1.5.x' into v2.0.x

2 parents17a3a6d +0cf4085 commita6f881aCopy full SHA for a6f881a

File tree

+10

-9

lines changed

+10

-9

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -281,7 +281,7 @@ def _from_ordinalf(x, tz=None):`
`281`	`281`	`elifdt.microsecond>999990:`
`282`	`282`	`dt+=datetime.timedelta(microseconds=1e6-dt.microsecond)`
`283`	`283`
`284`		`-returndt`
	`284`	`+returndt.astimezone(tz)`
`285`	`285`
`286`	`286`
`287`	`287`	`# a version of _from_ordinalf that can operate on numpy arrays`

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -387,7 +387,11 @@ def _fnt_def(self, k, c, s, d, a, l, n):`
`387`	`387`	`fontname=n[-l:].decode('ascii')`
`388`	`388`	`tfm=_tfmfile(fontname)`
`389`	`389`	`iftfmisNone:`
`390`		`-raiseFileNotFoundError("missing font metrics file: %s"%fontname)`
	`390`	`+ifsix.PY2:`
	`391`	`+error_class=OSError`
	`392`	`+else:`
	`393`	`+error_class=FileNotFoundError`
	`394`	`+raiseerror_class("missing font metrics file: %s"%fontname)`
`391`	`395`	`ifc!=0andtfm.checksum!=0andc!=tfm.checksum:`
`392`	`396`	`raiseValueError('tfm checksum mismatch: %s'%n)`
`393`	`397`

Lines changed: 2 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -26,8 +26,8 @@ def test_colorcycle_basic():`
`26`	`26`	`ax.legend(loc='upper left')`
`27`	`27`
`28`	`28`
`29`		`-@image_comparison(baseline_images=['marker_cycle'],remove_text=True,`
`30`		`-extensions=['png'])`
	`29`	`+@image_comparison(baseline_images=['marker_cycle','marker_cycle'],`
	`30`	`+remove_text=True,extensions=['png'])`
`31`	`31`	`deftest_marker_cycle():`
`32`	`32`	`fig=plt.figure()`
`33`	`33`	`ax=fig.add_subplot(111)`
`@@ -44,11 +44,6 @@ def test_marker_cycle():`
`44`	`44`	`ax.plot(xs,ys,label='red2 dot',lw=4,ms=16)`
`45`	`45`	`ax.legend(loc='upper left')`
`46`	`46`
`47`		`-`
`48`		`-# Reuse the image from test_marker_cycle()`
`49`		`-@image_comparison(baseline_images=['marker_cycle'],remove_text=True,`
`50`		`-extensions=['png'])`
`51`		`-deftest_marker_cycle_keywords():`
`52`	`47`	`fig=plt.figure()`
`53`	`48`	`ax=fig.add_subplot(111)`
`54`	`49`	`# Test keyword arguments, numpy arrays, and generic iterators`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,8 @@`
`24`	`24`	`R: Reject test. Copy the expected result to the source tree.`
`25`	`25`	`"""`
`26`	`26`
	`27`	`+from __future__importunicode_literals`
	`28`	`+`
`27`	`29`	`importos`
`28`	`30`	`importshutil`
`29`	`31`	`importsys`

Comments

(0)