Merge pull request #11916 from meeseeksmachine/auto-backport-of-pr-11897-on-v3.0.x

QuLogic · web-flow · commit 33a7dc8adc7c · 2018-08-22T21:40:40.000-04:00
Backport PR #11897 on branch v3.0.x
diff --git a/lib/matplotlib/animation.py b/lib/matplotlib/animation.py
@@ -849,16 +849,17 @@ def __init__(self, fps=30, codec=None, bitrate=None, extra_args=None,
             self.default_mode = 'loop'
             _log.warning("unrecognized default_mode: using 'loop'")
 
-        self._saved_frames = []
-        self._total_bytes = 0
-        self._hit_limit = False
         super().__init__(fps, codec, bitrate, extra_args, metadata)
 
     def setup(self, fig, outfile, dpi, frame_dir=None):
         root, ext = os.path.splitext(outfile)
         if ext not in ['.html', '.htm']:
             raise ValueError("outfile must be *.htm or *.html")
 
+        self._saved_frames = []
+        self._total_bytes = 0
+        self._hit_limit = False
+
         if not self.embed_frames:
             if frame_dir is None:
                 frame_dir = root + '_frames'
@@ -875,7 +876,6 @@ def grab_frame(self, **savefig_kwargs):
             # Just stop processing if we hit the limit
             if self._hit_limit:
                 return
-            suffix = '.' + self.frame_format
             f = BytesIO()
             self.fig.savefig(f, format=self.frame_format,
                              dpi=self.dpi, **savefig_kwargs)
@@ -909,11 +909,12 @@ def communicate(self):
         if self.embed_frames:
             fill_frames = _embedded_frames(self._saved_frames,
                                            self.frame_format)
+            Nframes = len(self._saved_frames)
         else:
             # temp names is filled by FileMovieWriter
             fill_frames = _included_frames(self._temp_names,
                                            self.frame_format)
-
+            Nframes = len(self._temp_names)
         mode_dict = dict(once_checked='',
                          loop_checked='',
                          reflect_checked='')
@@ -924,7 +925,7 @@ def communicate(self):
         with open(self.outfile, 'w') as of:
             of.write(JS_INCLUDE)
             of.write(DISPLAY_TEMPLATE.format(id=uuid.uuid4().hex,
-                                             Nframes=len(self._temp_names),
+                                             Nframes=Nframes,
                                              fill_frames=fill_frames,
                                              interval=interval,
                                              **mode_dict))
