Backport PR #16379 on branch v3.1.x (FIX: catch on message content, not module)#16382

tacaswell merged 1 commit intomatplotlib:v3.1.xmatplotlib/matplotlib:v3.1.xfrom

meeseeksmachine:auto-backport-of-pr-16379-on-v3.1.xmeeseeksmachine/matplotlib:auto-backport-of-pr-16379-on-v3.1.xCopy head branch name to clipboard