fixes bug 983194 - pyflakes 2014 spring cleanup
Merge pull request #1952 from peterbe/bug-983194-pyflakes-2014-spring-cleanup

fixes bug 983194 - pyflakes 2014 spring cleanup