This makes sense but what motivated this change?

pytest fails on test_axes.test_eventplot_problem_kwargs test and I have discovered that this issue actually persists in other places too, so after that I have fixed all the warnings.catch_warnings uses but have struck on test_figure.test_too_many_figures test that currently does not even work (it raises two warnings with range(22), but not one).

pep8 is fixed on master already.

Not bothering to wait for appveyor, it is super backed up today

Would any of these need backporting?