Merge pull request #1468 from graingert/fix-some-more-flake8-violations

docs/core/benchmarks/deferreds.py

@@ -73,7 +73,7 @@ def instantiateShootErrback():
     d = defer.Deferred()
     try:
         1 / 0
-    except:
+    except BaseException:
         d.errback()
     d.addErrback(lambda x: None)
 

docs/core/benchmarks/failure.py

@@ -47,15 +47,15 @@ def fail(n):
     for i in R:
         try:
             eval("deepFailure%d_0" % n)()
-        except:
+        except BaseException:
             failure.Failure()
 
 
 def fail_str(n):
     for i in R:
         try:
             eval("deepFailure%d_0" % n)()
-        except:
+        except BaseException:
             str(failure.Failure())
 
 
@@ -67,7 +67,7 @@ def fail_easy(n):
     for i in R:
         try:
             failure.Failure(PythonException())
-        except:
+        except BaseException:
             pass
 
 

docs/core/examples/courier.py

@@ -100,7 +100,7 @@ def filterMessage(self):
             with open(self.messageFilename) as f:
                 emailParser.parse(f)
             self.sendLine(b"200 Ok")
-        except:
+        except BaseException:
             trace_dump()
             self.sendLine(b"435 " + FILTERNAME.encode("ascii") + b" processing error")
 

docs/core/examples/cred.py

@@ -73,7 +73,7 @@ def lineReceived(self, line):
                 f(*line.split()[1:])
             except TypeError:
                 self.sendLine(b"Wrong number of arguments.")
-            except:
+            except BaseException:
                 self.sendLine(b"Server error (probably your fault)")
 
     def cmd_ANON(self):

docs/core/examples/echoserv.py

@@ -9,6 +9,8 @@
 ### Protocol Implementation
 
 # This is just about the simplest possible protocol
+
+
 class Echo(Protocol):
     def dataReceived(self, data):
         """

docs/core/examples/echoserv_udp.py

@@ -7,6 +7,8 @@
 from twisted.internet import reactor
 
 # Here's a UDP version of the simplest possible protocol
+
+
 class EchoUDP(DatagramProtocol):
     def datagramReceived(self, datagram, address):
         self.transport.write(datagram, address)

docs/core/examples/shaper.py

@@ -25,6 +25,8 @@
 serverFilter.buckets[None] = serverBucket
 
 # Web service is also limited per-host:
+
+
 class WebClientBucket(htb.Bucket):
     # Your first 10k is free
     maxburst = 10000

docs/core/examples/testlogging.py

@@ -20,7 +20,7 @@ def test(i):
     warnings.warn("warning {}".format(i))
     try:
         raise RuntimeError("error {}".format(i))
-    except:
+    except BaseException:
         log.err()
 
 

docs/core/howto/listings/pb/trap_client.py

@@ -33,7 +33,7 @@ def worksLike(obj):
         print(" InsecureJelly: you tried to send something unsafe to them")
     except (MyException, MyOtherException):
         print(" remote raised a MyException")  # or MyOtherException
-    except:
+    except BaseException:
         print(" something else happened")
     else:
         print(" method successful, response:", response)

docs/core/howto/logger.rst

@@ -113,7 +113,7 @@ Capturing Failures
 
     try:
         1 / 0
-    except:
+    except BaseException:
         log.failure("Math is hard!")
 
 The emitted event will have the ``"log_failure"`` key set, which is a :api:`twisted.python.failure.Failure <Failure>` that captures the exception.

docs/core/howto/logging.rst

@@ -44,7 +44,7 @@ functions:
   
       try:
           x = 1 / 0
-      except:
+      except BaseException:
           log.err()   # will log the ZeroDivisionError
 
 :api:`twisted.python.log.startLogging <startLogging>` 

docs/core/howto/tutorial/listings/finger/fingerproxy.tac

@@ -92,7 +92,7 @@ class ProxyFingerService(service.Service):
     def getUser(self, user):
         try:
             user, host = user.split("@", 1)
-        except:
+        except BaseException:
             user = user.strip()
             host = "127.0.0.1"
         ret = finger(user, host)

docs/historic/2003/europython/doanddont.html

@@ -49,7 +49,7 @@ <h2>Exceptions -- Catching Too Much -- Example</h2>
 <pre class="python">
 try:
    f = opne("file")
-except:
+except BaseException:
    sys.exit("no such file")
 </pre>
 

docs/historic/2003/pycon/deferex/deferex-complex-raise.py

@@ -9,5 +9,5 @@ class MyExc(Exception):
     print(x)
 except MyExc as me:
     print("error (", me, ").  x was:", x)
-except:
+except BaseException:
     print("fatal error! abort!")

docs/historic/2003/pycon/intrinsics-lightning/intrinsics-lightning

@@ -3,6 +3,7 @@
 from slides import *
 from twslides import *
 
+
 class PythonSource:
     def __init__(self, content):
         self.content = content 

docs/historic/2003/pycon/twisted-internet/twisted-internet.py

@@ -190,7 +190,7 @@ def stopFactory(self):
 
 try:
     doSomethingElse()
-except:
+except BaseException:
     log.deferr()
 """
 

docs/words/examples/cursesclient.py

@@ -165,7 +165,7 @@ def doRead(self):
             # for testing too
             try:
                 self.irc.sendLine(self.searchText)
-            except:
+            except BaseException:
                 pass
             self.stdscr.refresh()
             self.searchText = ""

setup.cfg

@@ -130,10 +130,6 @@ per-file-ignores =
         E265,
         # too many leading '#' for block comment
         E266,
-        # expected 2 blank lines, found 1
-        E302,
-        # expected 1 blank line before a nested definition, found 0
-        E306,
         # multiple imports on one line
         E401,
         # module level import not at top of file
@@ -142,12 +138,8 @@ per-file-ignores =
         E711,
         # comparison to True should be 'if cond is True:' or 'if cond:'
         E712,
-        # test for membership should be 'not in'
-        E713,
         # do not compare types, use 'isinstance()'
         E721,
-        # do not use bare 'except'
-        E722,
         # do not assign a lambda expression, use a def
         E731,
         # ambiguous variable name 'l'
@@ -156,21 +148,15 @@ per-file-ignores =
         E743,
         # .has_key() is deprecated, use 'in'
         W601,
-        # invalid escape sequence '\)'
-        W605,
     docs/*:
         # block comment should start with '# '
         E265,
         # too many leading '#' for block comment
         E266,
-        # expected 2 blank lines, found 1
-        E302,
         # multiple imports on one line
         E401,
         # module level import not at top of file
         E402,
-        # do not use bare 'except'
-        E722,
         # ambiguous variable name 'l'
         E741,
         # 'string' imported but unused

src/twisted/_threads/_team.py

@@ -179,7 +179,7 @@ def _coordinateThisTask(self, task):
         def doWork():
             try:
                 task()
-            except:
+            except BaseException:
                 self._logException()
 
             @self._coordinator.do
@@ -214,6 +214,7 @@ def quit(self):
         """
         self._quit.set()
         # In case all the workers are idle when we do this.
+
         @self._coordinator.do
         def startFinishing():
             self._shouldQuitCoordinator = True

src/twisted/application/app.py

@@ -304,7 +304,7 @@ def runReactorWithLogging(config, oldstdout, oldstderr, profiler=None, reactor=N
             pdb.runcall(reactor.run)
         else:
             reactor.run()
-    except:
+    except BaseException:
         close = False
         if config["nodaemon"]:
             file = oldstdout

src/twisted/conch/client/default.py

@@ -120,7 +120,7 @@ def isInKnownHosts(host, pubKey, options):
                 continue
             try:
                 decodedKey = decodebytes(encodedKey)
-            except:
+            except BaseException:
                 continue
             if decodedKey == pubKey:
                 return 1

src/twisted/conch/endpoints.py

@@ -422,6 +422,7 @@ def __init__(self, creator):
         # and to signal to other parts of this implementation (in particular
         # connectionLost) that it has already been fired and does not need to
         # be fired again.
+
         def readyFired(result):
             self.connectionReady = None
             return result
@@ -785,7 +786,7 @@ def _opener(self):
         """
         try:
             return self.tty.open("rb+")
-        except:
+        except BaseException:
             # Give back a file-like object from which can be read a byte string
             # that KnownHostsFile recognizes as rejecting some option (b"no").
             return _ReadFile(b"no")

src/twisted/conch/scripts/cftp.py

@@ -88,7 +88,7 @@ def handleError():
     exitStatus = 2
     try:
         reactor.stop()
-    except:
+    except BaseException:
         pass
     log.err(failure.Failure())
     raise
@@ -517,7 +517,7 @@ def _cbPutMultipleNext(self, previousResult, files, remotePath, single=False):
             try:
                 currentFile = files.pop(0)
                 localStream = open(currentFile, "rb")
-            except:
+            except BaseException:
                 self._printFailure(failure.Failure())
                 currentFile = None
 

src/twisted/conch/scripts/conch.py

@@ -161,13 +161,13 @@ def run():
     fd = sys.stdin.fileno()
     try:
         old = tty.tcgetattr(fd)
-    except:
+    except BaseException:
         old = None
     try:
         oldUSR1 = signal.signal(
             signal.SIGUSR1, lambda *a: reactor.callLater(0, reConnect)
         )
-    except:
+    except BaseException:
         oldUSR1 = None
     try:
         reactor.run()
@@ -196,7 +196,7 @@ def handleError():
 def _stopReactor():
     try:
         reactor.stop()
-    except:
+    except BaseException:
         pass
 
 
@@ -537,7 +537,7 @@ def _enterRawMode():
     try:
         old = tty.tcgetattr(fd)
         new = old[:]
-    except:
+    except BaseException:
         log.msg("not a typewriter!")
     else:
         # iflage

src/twisted/conch/scripts/tkconch.py

@@ -519,7 +519,7 @@ def getPublicKey(self):
             return
         try:
             return keys.Key.fromFile(file).blob()
-        except:
+        except BaseException:
             return self.getPublicKey()  # try again
 
     def getPrivateKey(self):

src/twisted/conch/test/test_cftp.py

@@ -905,7 +905,7 @@ def tearDown(self):
         for f in ["dsa_test.pub", "dsa_test", "kh_test"]:
             try:
                 os.remove(f)
-            except:
+            except BaseException:
                 pass
         return SFTPTestBase.tearDown(self)
 

src/twisted/conch/test/test_conch.py

@@ -646,7 +646,7 @@ def assertExecuteWithKexAlgorithm(self, keyExchangeAlgo):
             if not isinstance(output, str):
                 output = output.decode("utf-8")
             kexAlgorithms = output.split()
-        except:
+        except BaseException:
             pass
 
         if keyExchangeAlgo not in kexAlgorithms:

src/twisted/conch/test/test_endpoints.py

@@ -255,7 +255,7 @@ def connect(self, factory):
 
         try:
             protocol = factory.buildProtocol(MemoryAddress())
-        except:
+        except BaseException:
             return fail()
         else:
             self.pump = connect(

src/twisted/conch/test/test_filetransfer.py

@@ -652,6 +652,7 @@ def buildServerConnection(self):
         # make a server connection
         conn = connection.SSHConnection()
         # server connections have a 'self.transport.avatar'.
+
         class DummyTransport:
             def __init__(self):
                 self.transport = self

src/twisted/conch/test/test_manhole.py

@@ -34,7 +34,7 @@ def determineDefaultFunctionName():
     """
     try:
         1 // 0
-    except:
+    except BaseException:
         # The last frame is this function.  The second to last frame is this
         # function's caller, which is module-scope, which is what we want,
         # so -2.

src/twisted/conch/test/test_ssh.py

@@ -108,7 +108,7 @@ def global_tcpip_forward(self, data):
                 ),
                 interface=host,
             )
-        except:
+        except BaseException:
             log.err(None, "something went wrong with remote->local forwarding")
             return 0
         else:

src/twisted/conch/unix.py

@@ -97,7 +97,7 @@ def global_tcpip_forward(self, data):
                 ),
                 interface=hostToBind,
             )
-        except:
+        except BaseException:
             return 0
         else:
             self.listeners[(hostToBind, portToBind)] = listener

src/twisted/cred/_digest.py

@@ -29,6 +29,8 @@
 }
 
 # DigestCalcHA1
+
+
 def calcHA1(
     pszAlg, pszUserName, pszRealm, pszPassword, pszNonce, pszCNonce, preHA1=None
 ):