Be more explicit when catching the exception when doing the pyparsing
monkeypatch check.
Merge pull request #2435 from mdboom/pyparsing-monkeypatch-check-for-typeerror

Explicitly catch TypeError when doing pyparsing monkeypatch check