apply as much of the patch as still applies

git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/branches/python-pyflakes-6988@43292 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb