Skip to content

Merge 1.5.x to 2.x #6443

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 13 commits into from
May 21, 2016
Merged

Merge 1.5.x to 2.x #6443

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
8e2b7a9
Defer to 2D scatter() for handling of 'c'. Closes #5974.
WeatherGod May 17, 2016
fc654e6
Merge pull request #6439 from WeatherGod/scatter3d_color
mdboom May 17, 2016
7d1f717
MNT: Raise an error for invalid args in animation.save.
dopplershift May 17, 2016
ecfc1e7
MNT: Improve error message when saving animation fails.
dopplershift May 17, 2016
5e5999f
MNT: Add original exception to raised IOError.
dopplershift May 17, 2016
7c98a98
MNT: Re-arrange docs to avoid repeating save verbiage.
dopplershift May 17, 2016
e2549cd
Merge pull request #6441 from dopplershift/anim-errors
WeatherGod May 17, 2016
27d1199
Revert 2c1bc6b for performance
mdboom May 19, 2016
2c5d292
Use ( , ) instead of [] for indexing
mdboom May 19, 2016
7976970
Rename operator[] to subarray...
mdboom May 19, 2016
aef86ad
Don't use contouring on the path unless necessary
mdboom May 19, 2016
5bad764
Merge pull request #6450 from mdboom/slow-path
tacaswell May 19, 2016
712500d
Merge remote-tracking branch 'matplotlib/v1.5.x' into merge15xto2x
jenshnielsen May 21, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
MNT: Improve error message when saving animation fails.
  • Loading branch information
@dopplershift
dopplershift committed May 17, 2016
commit ecfc1e724173e2ac7bb8e3d1fe9a368e976b3df5
6 changes: 4 additions & 2 deletions lib/matplotlib/animation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,12 +234,14 @@ def grab_frame(self, **savefig_kwargs):
# frame format and dpi.
self.fig.savefig(self._frame_sink(), format=self.frame_format,
dpi=self.dpi, **savefig_kwargs)
except RuntimeError:
except (RuntimeError, IOError):
out, err = self._proc.communicate()
verbose.report('MovieWriter -- Error '
'running proc:\n%s\n%s' % (out,
err), level='helpful')
raise
raise IOError('Error saving animation to file. '
'Stdout: {0} StdError: {1}. It may help to re-run '
'with --verbose-debug.'.format(out, err))

def _frame_sink(self):
'Returns the place to which frames should be written.'
Expand Down