Merge pull request #3978 from graingert/remove-seemingly-redundant-pyflakes-references

remove seemingly redundant pyflakes references