Commit925e1e5

authored

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

Backport PR#25339 on branch v3.7.x (Disable discarded animation warning on save)

2 parents83bf223 +d526148 commit925e1e5Copy full SHA for 925e1e5

File tree

+11

-7

lines changed

+11

-7

lines changed

Lines changed: 9 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -992,6 +992,15 @@ def func(current_frame: int, total_frames: int) -> Any`
`992`	`992`	is a `.MovieWriter`, a `RuntimeError` will be raised.
`993`	`993`	`"""`
`994`	`994`
	`995`	`+all_anim= [self]`
	`996`	`+ifextra_animisnotNone:`
	`997`	`+all_anim.extend(animforaniminextra_anim`
	`998`	`+ifanim._figisself._fig)`
	`999`	`+`
	`1000`	`+# Disable "Animation was deleted without rendering" warning.`
	`1001`	`+foraniminall_anim:`
	`1002`	`+anim._draw_was_started=True`
	`1003`	`+`
`995`	`1004`	`ifwriterisNone:`
`996`	`1005`	`writer=mpl.rcParams['animation.writer']`
`997`	`1006`	`elif (notisinstance(writer,str)and`
`@@ -1030,11 +1039,6 @@ def func(current_frame: int, total_frames: int) -> Any`
`1030`	`1039`	`ifmetadataisnotNone:`
`1031`	`1040`	`writer_kwargs['metadata']=metadata`
`1032`	`1041`
`1033`		`-all_anim= [self]`
`1034`		`-ifextra_animisnotNone:`
`1035`		`-all_anim.extend(animforaniminextra_anim`
`1036`		`-ifanim._figisself._fig)`
`1037`		`-`
`1038`	`1042`	`# If we have the name of a writer, instantiate an instance of the`
`1039`	`1043`	`# registered class.`
`1040`	`1044`	`ifisinstance(writer,str):`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -514,5 +514,5 @@ def test_movie_writer_invalid_path(anim):`
`514`	`514`	`else:`
`515`	`515`	`match_str=re.escape("[Errno 2] No such file or directory: '/foo")`
`516`	`516`	`withpytest.raises(FileNotFoundError,match=match_str):`
`517`		`-_=anim.save("/foo/bar/aardvark/thiscannotreallyexist.mp4",`
`518`		`-writer=animation.FFMpegFileWriter())`
	`517`	`+anim.save("/foo/bar/aardvark/thiscannotreallyexist.mp4",`
	`518`	`+writer=animation.FFMpegFileWriter())`

Comments

(0)