Commit358b290

authored

Merge pull request#25299 from meeseeksmachine/auto-backport-of-pr-25238-on-v3.7.x

Backport PR#25238 on branch v3.7.x (Check file path for animation and raise if it does not exist)

2 parentse4a3b14 +08293ca commit358b290Copy full SHA for 358b290

File tree

+15

-1

lines changed

+15

-1

lines changed

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -193,6 +193,8 @@ def setup(self, fig, outfile, dpi=None):`
`193`	`193`	`The DPI (or resolution) for the file. This controls the size`
`194`	`194`	`in pixels of the resulting movie file.`
`195`	`195`	`"""`
	`196`	`+# Check that path is valid`
	`197`	`+Path(outfile).parent.resolve(strict=True)`
`196`	`198`	`self.outfile=outfile`
`197`	`199`	`self.fig=fig`
`198`	`200`	`ifdpiisNone:`
`@@ -405,6 +407,8 @@ def setup(self, fig, outfile, dpi=None, frame_prefix=None):`
`405`	`407`	deleted by `finish`; if not None, no temporary files are
`406`	`408`	`deleted.`
`407`	`409`	`"""`
	`410`	`+# Check that path is valid`
	`411`	`+Path(outfile).parent.resolve(strict=True)`
`408`	`412`	`self.fig=fig`
`409`	`413`	`self.outfile=outfile`
`410`	`414`	`ifdpiisNone:`
`@@ -423,7 +427,7 @@ def setup(self, fig, outfile, dpi=None, frame_prefix=None):`
`423`	`427`	`self.fname_format_str='%s%%07d.%s'`
`424`	`428`
`425`	`429`	`def__del__(self):`
`426`		`-ifself._tmpdir:`
	`430`	`+ifhasattr(self,'_tmpdir')andself._tmpdir:`
`427`	`431`	`self._tmpdir.cleanup()`
`428`	`432`
`429`	`433`	`@property`

Lines changed: 10 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -506,3 +506,13 @@ def test_disable_cache_warning(anim):`
`506`	`506`	`)`
`507`	`507`	`assertanim._cache_frame_dataisFalse`
`508`	`508`	`anim._init_draw()`
	`509`	`+`
	`510`	`+`
	`511`	`+deftest_movie_writer_invalid_path(anim):`
	`512`	`+ifsys.platform=="win32":`
	`513`	`+match_str=re.escape("[WinError 3] The system cannot find the path specified:")`
	`514`	`+else:`
	`515`	`+match_str=re.escape("[Errno 2] No such file or directory: '/foo")`
	`516`	`+withpytest.raises(FileNotFoundError,match=match_str):`
	`517`	`+_=anim.save("/foo/bar/aardvark/thiscannotreallyexist.mp4",`
	`518`	`+writer=animation.FFMpegFileWriter())`

Comments

(0)