Mercurial Repositories > eric / file diff

diff -r fb0ef164f536 -r 698ae46f40a4 eric6/Debugger/DebugServer.py
--- a/eric6/Debugger/DebugServer.py	Fri Apr 02 11:59:41 2021 +0200
+++ b/eric6/Debugger/DebugServer.py	Sat May 01 14:27:20 2021 +0200
@@ -9,6 +9,7 @@
 
 import os
 import shlex
+import contextlib
 
 from PyQt5.QtCore import pyqtSignal, pyqtSlot, QModelIndex
 from PyQt5.QtNetwork import (
@@ -186,7 +187,7 @@
         @param parent reference to the parent object
         @type QObject
         """
-        super(DebugServer, self).__init__(parent)
+        super().__init__(parent)
         
         self.__originalPathString = originalPathString
         
@@ -425,10 +426,8 @@
         @rtype list of str
         """
         languages = list(self.__debuggerInterfaceRegistry.keys())
-        try:
+        with contextlib.suppress(ValueError):
             languages.remove("None")
-        except ValueError:
-            pass    # it is not in the list
         
         if shellOnly:
             languages = [lang for lang in languages
@@ -508,11 +507,14 @@
         """
         self.running = False
         
-        if not self.passive or not self.passiveClientExited:
-            if self.debuggerInterface and self.debuggerInterface.isConnected():
-                self.shutdownServer()
-                self.debugging = False
-                self.clientGone.emit(unplanned and self.debugging)
+        if (
+            (not self.passive or not self.passiveClientExited) and
+            self.debuggerInterface and
+            self.debuggerInterface.isConnected()
+        ):
+            self.shutdownServer()
+            self.debugging = False
+            self.clientGone.emit(unplanned and self.debugging)
         
         if clType:
             if clType not in self.getSupportedLanguages():
@@ -1485,11 +1487,8 @@
         @param debuggerId ID of the debugger backend
         @type str
         """
-        try:
+        with contextlib.suppress(AttributeError):
             self.debuggerInterface.remoteClientDisassembly(debuggerId)
-        except AttributeError:
-            # remote client doesn't support that
-            pass
     
     def remoteClientSetFilter(self, debuggerId, scope, filterStr):
         """
@@ -1994,12 +1993,9 @@
         @param venvName name of the virtual environment
         @type str
         """
-        try:
+        with contextlib.suppress(KeyError):
             self.__debuggerInterfaceRegistry[clientType][0] = capabilities
             self.clientCapabilities.emit(capabilities, clientType, venvName)
-        except KeyError:
-            # ignore silently
-            pass
     
     def signalClientCompletionList(self, completionList, text, debuggerId):
         """