diff -r 59a9a658618c -r 93b8a353c4bf eric6/PluginManager/PluginManager.py
--- a/eric6/PluginManager/PluginManager.py Wed Apr 14 19:38:19 2021 +0200
+++ b/eric6/PluginManager/PluginManager.py Wed Apr 14 19:59:16 2021 +0200
@@ -12,6 +12,7 @@
import zipfile
import types
import importlib
+import contextlib
from PyQt5.QtCore import (
pyqtSignal, QObject, QDate, QFile, QFileInfo, QUrl, QIODevice
@@ -643,18 +644,14 @@
if onDemand:
self.__onDemandInactiveModules.pop(name)
- try:
+ with contextlib.suppress(KeyError):
self.__onDemandInactivePlugins.pop(name)
- except KeyError:
- pass
self.__onDemandActivePlugins[name] = pluginObject
self.__onDemandActiveModules[name] = module
else:
self.__inactiveModules.pop(name)
- try:
+ with contextlib.suppress(KeyError):
self.__inactivePlugins.pop(name)
- except KeyError:
- pass
self.__activePlugins[name] = pluginObject
self.__activeModules[name] = module
return obj
@@ -739,10 +736,8 @@
self.__onDemandInactiveModules[name] = module
else:
self.__activeModules.pop(name)
- try:
+ with contextlib.suppress(KeyError):
self.__activePlugins.pop(name)
- except KeyError:
- pass
self.__inactivePlugins[name] = pluginObject
self.__inactiveModules[name] = module
