diff -r 359f9805af93 -r d061dda35cef PluginPrintRemover.py
--- a/PluginPrintRemover.py Wed Dec 30 11:02:14 2020 +0100
+++ b/PluginPrintRemover.py Mon Apr 26 19:46:00 2021 +0200
@@ -7,6 +7,7 @@
Module implementing the Print Remover plug-in.
"""
+import contextlib
import os
from PyQt5.QtCore import QObject, QTranslator, QCoreApplication
@@ -21,7 +22,7 @@
author = "Detlev Offenbach <detlev@die-offenbachs.de>"
autoactivate = True
deactivateable = True
-version = "3.0.0"
+version = "3.1.0"
className = "PrintRemoverPlugin"
packageName = "PrintRemover"
shortDescription = "Remove print() like debug statements."
@@ -64,14 +65,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 {
"printRemoverPage": [
@@ -102,7 +101,7 @@
@param ui reference to the user interface object (UI.UserInterface)
"""
- QObject.__init__(self, ui)
+ super().__init__(ui)
self.__ui = ui
self.__defaults = {
@@ -272,12 +271,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):
"""
@@ -288,15 +285,17 @@
@param menu reference to the menu (QMenu)
@param editor reference to the editor
"""
- if menuName == "Tools":
- if self.__menu.menuAction() not in menu.actions():
- # Re-add our menu
- self.__editors[editor] = []
- if not menu.isEmpty():
- act = menu.addSeparator()
- self.__editors[editor].append(act)
- act = menu.addMenu(self.__menu)
+ if (
+ menuName == "Tools" and
+ self.__menu.menuAction() not in menu.actions()
+ ):
+ # Re-add our menu
+ self.__editors[editor] = []
+ if not menu.isEmpty():
+ act = menu.addSeparator()
self.__editors[editor].append(act)
+ act = menu.addMenu(self.__menu)
+ self.__editors[editor].append(act)
def __showMenu(self):
"""
