Merge pyflakes-cleanup-8122: Clean up the last non-deprecated, non-au…

…togenerated pyflakes warnings Author: adiroiban Reviewer: hawkowl Fixes: twisted#8122 git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/trunk@46382 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb
rklabs · Dec 2, 2015 · 8f067df · 8f067df
1 parent 496c987
commit 8f067df
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 9 deletions.
diff --git a/twisted/internet/process.py b/twisted/internet/process.py
@@ -994,10 +994,9 @@ def __init__(self, reactor, executable, args, environment, path, proto,
         _BaseProcess.__init__(self, proto)
 
         if isinstance(usePTY, (tuple, list)):
-            masterfd, slavefd, ttyname = usePTY
+            masterfd, slavefd, _ = usePTY
         else:
             masterfd, slavefd = pty.openpty()
-            ttyname = os.ttyname(slavefd)
 
         try:
             self._fork(path, uid, gid, executable, args, environment,

diff --git a/twisted/news/nntp.py b/twisted/news/nntp.py
@@ -701,7 +701,7 @@ def do_POST(self):
     def _doingPost(self, line):
         if line == '.':
             self.inputHandler = None
-            group, article = self.currentGroup, self.message
+            article = self.message
             self.message = ''
 
             defer = self.factory.backend.postRequest(article)

diff --git a/twisted/python/dist.py b/twisted/python/dist.py
@@ -64,7 +64,7 @@
 
 _EXTRA_OPTIONS = dict(
     dev=['twistedchecker >= 0.4.0',
-         'pyflakes >= 0.9.2',
+         'pyflakes >= 1.0.0',
          'twisted-dev-tools >= 0.0.2',
          'python-subunit',
          'sphinx >= 1.3.1',

diff --git a/twisted/python/test/test_dist.py b/twisted/python/test/test_dist.py
@@ -102,7 +102,7 @@ def test_extrasRequiresDevDeps(self):
         """
         deps = _EXTRAS_REQUIRE['dev']
         self.assertIn('twistedchecker >= 0.4.0', deps)
-        self.assertIn('pyflakes >= 0.9.2', deps)
+        self.assertIn('pyflakes >= 1.0.0', deps)
         self.assertIn('twisted-dev-tools >= 0.0.2', deps)
         self.assertIn('python-subunit', deps)
         self.assertIn('sphinx >= 1.3.1', deps)

diff --git a/twisted/python/test/test_release.py b/twisted/python/test/test_release.py
@@ -28,7 +28,6 @@
 from twisted.python.filepath import FilePath
 from twisted.python.versions import Version
 
-from twisted.web.microdom import parseXMLString
 from twisted.python._release import (
     _changeVersionInFile, getNextVersion, findTwistedProjects, replaceInFile,
     replaceProjectVersion, Project, generateVersionFileData,
@@ -1417,9 +1416,8 @@ def createFakeSphinxProject(self):
 
     def verifyFileExists(self, fileDir, fileName):
         """
-        Helper which verifies that C{fileName} exists in C{fileDir}, has some
-        content, and that the content is parseable by L{parseXMLString} if the
-        file extension indicates that it should be html.
+        Helper which verifies that C{fileName} exists in C{fileDir} and it has
+        some content.
 
         @param fileDir: A path to a directory.
         @type fileDir: L{FilePath}

diff --git a/twisted/topfiles/8122.misc b/twisted/topfiles/8122.misc