--- a/PluginSelectionEncloser.py Wed Dec 30 11:02:15 2020 +0100 +++ b/PluginSelectionEncloser.py Mon Apr 26 19:57:50 2021 +0200 @@ -7,6 +7,7 @@ Module implementing the Selection Encloser plug-in. """ +import contextlib import os import json @@ -22,7 +23,7 @@ author = "Detlev Offenbach <detlev@die-offenbachs.de>" autoactivate = True deactivateable = True -version = "3.1.0" +version = "3.2.0" className = "SelectionEncloserPlugin" packageName = "SelectionEncloser" shortDescription = "Enclose the selection with a string." @@ -63,14 +64,12 @@ try: usesDarkPalette = e5App().usesDarkPalette() except AttributeError: + # for eric6 < 20.4 from PyQt5.QtGui import QPalette palette = e5App().palette() lightness = palette.color(QPalette.Window).lightness() usesDarkPalette = lightness <= 128 - if usesDarkPalette: - iconSuffix = "dark" - else: - iconSuffix = "light" + iconSuffix = "dark" if usesDarkPalette else "light" return { "selectionEncloserPage": [ @@ -101,7 +100,7 @@ @param ui reference to the user interface object (UI.UserInterface) """ - QObject.__init__(self, ui) + super.__init__(ui) self.__ui = ui # menu is a list of lists; each list consists of a string for the @@ -295,12 +294,10 @@ @param editor reference to the editor (QScintilla.Editor) """ - try: + with contextlib.suppress(KeyError): del self.__editors[editor] if not self.__editors: self.__menu.setEnabled(False) - except KeyError: - pass def __editorShowMenu(self, menuName, menu, editor): """