fix flake8 E722 do not use bare 'except'

avemar · Oct 26, 2020 · 268354f · 268354f
1 parent a8fa466
commit 268354f
Show file tree

Hide file tree

Showing 120 changed files with 284 additions and 288 deletions.
diff --git a/docs/core/benchmarks/deferreds.py b/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)
 

diff --git a/docs/core/benchmarks/failure.py b/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
 
 

diff --git a/docs/core/examples/courier.py b/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")
 

diff --git a/docs/core/examples/cred.py b/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):

diff --git a/docs/core/examples/testlogging.py b/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()
 
 

diff --git a/docs/core/howto/listings/pb/trap_client.py b/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)

diff --git a/docs/core/howto/logger.rst b/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.

diff --git a/docs/core/howto/logging.rst b/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>` 

diff --git a/docs/core/howto/tutorial/listings/finger/fingerproxy.tac b/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)

diff --git a/docs/historic/2003/europython/doanddont.html b/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>
 

diff --git a/docs/historic/2003/pycon/deferex/deferex-complex-raise.py b/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!")
diff --git a/docs/historic/2003/pycon/twisted-internet/twisted-internet.py b/docs/historic/2003/pycon/twisted-internet/twisted-internet.py
@@ -190,7 +190,7 @@ def stopFactory(self):
 
 try:
     doSomethingElse()
-except:
+except BaseException:
     log.deferr()
 """
 

diff --git a/docs/words/examples/cursesclient.py b/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 = ""

diff --git a/setup.cfg b/setup.cfg
@@ -140,8 +140,6 @@ per-file-ignores =
         E712,
         # 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'
@@ -159,8 +157,6 @@ per-file-ignores =
         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

diff --git a/src/twisted/_threads/_team.py b/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

diff --git a/src/twisted/application/app.py b/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

diff --git a/src/twisted/conch/client/default.py b/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

diff --git a/src/twisted/conch/endpoints.py b/src/twisted/conch/endpoints.py
@@ -786,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")

diff --git a/src/twisted/conch/scripts/cftp.py b/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
 

diff --git a/src/twisted/conch/scripts/conch.py b/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

diff --git a/src/twisted/conch/scripts/tkconch.py b/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):

diff --git a/src/twisted/conch/test/test_cftp.py b/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)
 

diff --git a/src/twisted/conch/test/test_conch.py b/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:

diff --git a/src/twisted/conch/test/test_endpoints.py b/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(

diff --git a/src/twisted/conch/test/test_manhole.py b/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.

diff --git a/src/twisted/conch/test/test_ssh.py b/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:

diff --git a/src/twisted/conch/unix.py b/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

diff --git a/src/twisted/enterprise/adbapi.py b/src/twisted/enterprise/adbapi.py
@@ -56,7 +56,7 @@ def rollback(self):
             curs.close()
             self._connection.commit()
             return
-        except:
+        except BaseException:
             log.err(None, "Rollback failed")
 
         self._pool.disconnect(self._connection)
@@ -104,7 +104,7 @@ def reopen(self):
         try:
             self._cursor = self._connection.cursor()
             return
-        except:
+        except BaseException:
             if not self._pool.reconnect:
                 raise
             else:
@@ -284,11 +284,11 @@ def _runWithConnection(self, func, *args, **kw):
             result = func(conn, *args, **kw)
             conn.commit()
             return result
-        except:
+        except BaseException:
             excType, excValue, excTraceback = sys.exc_info()
             try:
                 conn.rollback()
-            except:
+            except BaseException:
                 log.err(None, "Rollback failed")
             compat.reraise(excValue, excTraceback)
 
@@ -436,7 +436,7 @@ def _close(self, conn):
             log.msg("adbapi closing: {}".format(self.dbapiName))
         try:
             conn.close()
-        except:
+        except BaseException:
             log.err(None, "Connection close failed")
 
     def _runInteraction(self, interaction, *args, **kw):
@@ -447,11 +447,11 @@ def _runInteraction(self, interaction, *args, **kw):
             trans.close()
             conn.commit()
             return result
-        except:
+        except BaseException:
             excType, excValue, excTraceback = sys.exc_info()
             try:
                 conn.rollback()
-            except:
+            except BaseException:
                 log.err(None, "Rollback failed")
             compat.reraise(excValue, excTraceback)
 

diff --git a/src/twisted/internet/_posixstdio.py b/src/twisted/internet/_posixstdio.py
@@ -123,7 +123,7 @@ def _writeConnectionLost(self, reason):
         if p:
             try:
                 p.writeConnectionLost()
-            except:
+            except BaseException:
                 log.err()
                 self.connectionLost(failure.Failure())
 
@@ -133,7 +133,7 @@ def _readConnectionLost(self, reason):
         if p:
             try:
                 p.readConnectionLost()
-            except:
+            except BaseException:
                 log.err()
                 self.connectionLost(failure.Failure())
         else:

diff --git a/src/twisted/internet/_producer_helpers.py b/src/twisted/internet/_producer_helpers.py
@@ -62,7 +62,7 @@ def _pull(self):
         while True:
             try:
                 self._producer.resumeProducing()
-            except:
+            except BaseException:
                 log.err(
                     None,
                     "%s failed, producing will be stopped:"
@@ -72,7 +72,7 @@ def _pull(self):
                     self._consumer.unregisterProducer()
                     # The consumer should now call stopStreaming() on us,
                     # thus stopping the streaming.
-                except:
+                except BaseException:
                     # Since the consumer blew up, we may not have had
                     # stopStreaming() called, so we just stop on our own:
                     log.err(
-Original file line number
+Diff line change
@@ Expand Up / @@ -113,7 +113,7 @@ Capturing Failures @@
         try:
 / 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.
@@ Expand Down @@