--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py Wed Jul 13 11:16:20 2022 +0200
+++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py Wed Jul 13 14:55:47 2022 +0200
@@ -17,8 +17,14 @@
from PyQt6.QtCore import pyqtSlot, Qt, QTimer, QCoreApplication
from PyQt6.QtGui import QIcon
from PyQt6.QtWidgets import (
- QDialog, QTreeWidgetItem, QAbstractButton, QDialogButtonBox, QApplication,
- QListWidgetItem, QInputDialog, QLineEdit
+ QDialog,
+ QTreeWidgetItem,
+ QAbstractButton,
+ QDialogButtonBox,
+ QApplication,
+ QListWidgetItem,
+ QInputDialog,
+ QLineEdit,
)
from EricWidgets.EricApplication import ericApp
@@ -32,18 +38,15 @@
from . import pycodestyle
from . import CodeStyleCheckerUtilities
-from .Miscellaneous.MiscellaneousDefaults import (
- MiscellaneousCheckerDefaultArgs
-)
-from .Annotations.AnnotationsCheckerDefaults import (
- AnnotationsCheckerDefaultArgs
-)
+from .Miscellaneous.MiscellaneousDefaults import MiscellaneousCheckerDefaultArgs
+from .Annotations.AnnotationsCheckerDefaults import AnnotationsCheckerDefaultArgs
class CodeStyleCheckerDialog(QDialog, Ui_CodeStyleCheckerDialog):
"""
Class implementing a dialog to show the results of the code style check.
"""
+
filenameRole = Qt.ItemDataRole.UserRole + 1
lineRole = Qt.ItemDataRole.UserRole + 2
positionRole = Qt.ItemDataRole.UserRole + 3
@@ -52,63 +55,56 @@
codeRole = Qt.ItemDataRole.UserRole + 6
ignoredRole = Qt.ItemDataRole.UserRole + 7
argsRole = Qt.ItemDataRole.UserRole + 8
-
+
availableFutures = [
- 'division', 'absolute_import', 'with_statement',
- 'print_function', 'unicode_literals', 'generator_stop',
- 'annotations']
-
+ "division",
+ "absolute_import",
+ "with_statement",
+ "print_function",
+ "unicode_literals",
+ "generator_stop",
+ "annotations",
+ ]
+
cryptoBitSelectionsDsaRsa = [
- "512", "1024", "2048", "4096", "8192", "16384", "32786",
+ "512",
+ "1024",
+ "2048",
+ "4096",
+ "8192",
+ "16384",
+ "32786",
]
cryptoBitSelectionsEc = [
- "160", "224", "256", "384", "512",
+ "160",
+ "224",
+ "256",
+ "384",
+ "512",
]
-
+
checkCategories = {
- "A": QCoreApplication.translate(
- "CheckerCategories",
- "Annotations"),
- "C": QCoreApplication.translate(
- "CheckerCategories",
- "Code Complexity"),
- "D": QCoreApplication.translate(
- "CheckerCategories",
- "Documentation"),
- "E": QCoreApplication.translate(
- "CheckerCategories",
- "Errors"),
- "I": QCoreApplication.translate(
- "CheckerCategories",
- "Imports"),
- "M": QCoreApplication.translate(
- "CheckerCategories",
- "Miscellaneous"),
- "N": QCoreApplication.translate(
- "CheckerCategories",
- "Naming"),
- "P": QCoreApplication.translate(
- "CheckerCategories",
- "'pathlib' Usage"),
- "S": QCoreApplication.translate(
- "CheckerCategories",
- "Security"),
- "W": QCoreApplication.translate(
- "CheckerCategories",
- "Warnings"),
- "Y": QCoreApplication.translate(
- "CheckerCategories",
- "Simplify Code"),
+ "A": QCoreApplication.translate("CheckerCategories", "Annotations"),
+ "C": QCoreApplication.translate("CheckerCategories", "Code Complexity"),
+ "D": QCoreApplication.translate("CheckerCategories", "Documentation"),
+ "E": QCoreApplication.translate("CheckerCategories", "Errors"),
+ "I": QCoreApplication.translate("CheckerCategories", "Imports"),
+ "M": QCoreApplication.translate("CheckerCategories", "Miscellaneous"),
+ "N": QCoreApplication.translate("CheckerCategories", "Naming"),
+ "P": QCoreApplication.translate("CheckerCategories", "'pathlib' Usage"),
+ "S": QCoreApplication.translate("CheckerCategories", "Security"),
+ "W": QCoreApplication.translate("CheckerCategories", "Warnings"),
+ "Y": QCoreApplication.translate("CheckerCategories", "Simplify Code"),
}
-
+
noResults = 0
noFiles = 1
hasResults = 2
-
+
def __init__(self, styleCheckService, project=None, parent=None):
"""
Constructor
-
+
@param styleCheckService reference to the service
@type CodeStyleCheckService
@param project reference to the project if called on project or project
@@ -120,76 +116,68 @@
super().__init__(parent)
self.setupUi(self)
self.setWindowFlags(Qt.WindowType.Window)
-
+
self.__project = project
-
+
self.optionsTabWidget.setCurrentIndex(0)
-
- self.excludeMessagesSelectButton.setIcon(
- UI.PixmapCache.getIcon("select"))
- self.includeMessagesSelectButton.setIcon(
- UI.PixmapCache.getIcon("select"))
- self.fixIssuesSelectButton.setIcon(
- UI.PixmapCache.getIcon("select"))
- self.noFixIssuesSelectButton.setIcon(
- UI.PixmapCache.getIcon("select"))
-
+
+ self.excludeMessagesSelectButton.setIcon(UI.PixmapCache.getIcon("select"))
+ self.includeMessagesSelectButton.setIcon(UI.PixmapCache.getIcon("select"))
+ self.fixIssuesSelectButton.setIcon(UI.PixmapCache.getIcon("select"))
+ self.noFixIssuesSelectButton.setIcon(UI.PixmapCache.getIcon("select"))
+
self.docTypeComboBox.addItem(self.tr("PEP-257"), "pep257")
self.docTypeComboBox.addItem(self.tr("Eric"), "eric")
self.docTypeComboBox.addItem(self.tr("Eric (Blacked)"), "eric_black")
-
+
for category, text in CodeStyleCheckerDialog.checkCategories.items():
itm = QListWidgetItem(text, self.categoriesList)
itm.setData(Qt.ItemDataRole.UserRole, category)
itm.setFlags(itm.flags() | Qt.ItemFlag.ItemIsUserCheckable)
itm.setCheckState(Qt.CheckState.Unchecked)
-
+
for future in CodeStyleCheckerDialog.availableFutures:
itm = QListWidgetItem(future, self.futuresList)
itm.setFlags(itm.flags() | Qt.ItemFlag.ItemIsUserCheckable)
itm.setCheckState(Qt.CheckState.Unchecked)
-
- self.dsaHighRiskCombo.addItems(
- CodeStyleCheckerDialog.cryptoBitSelectionsDsaRsa)
+
+ self.dsaHighRiskCombo.addItems(CodeStyleCheckerDialog.cryptoBitSelectionsDsaRsa)
self.dsaMediumRiskCombo.addItems(
- CodeStyleCheckerDialog.cryptoBitSelectionsDsaRsa)
- self.rsaHighRiskCombo.addItems(
- CodeStyleCheckerDialog.cryptoBitSelectionsDsaRsa)
+ CodeStyleCheckerDialog.cryptoBitSelectionsDsaRsa
+ )
+ self.rsaHighRiskCombo.addItems(CodeStyleCheckerDialog.cryptoBitSelectionsDsaRsa)
self.rsaMediumRiskCombo.addItems(
- CodeStyleCheckerDialog.cryptoBitSelectionsDsaRsa)
- self.ecHighRiskCombo.addItems(
- CodeStyleCheckerDialog.cryptoBitSelectionsEc)
- self.ecMediumRiskCombo.addItems(
- CodeStyleCheckerDialog.cryptoBitSelectionsEc)
-
+ CodeStyleCheckerDialog.cryptoBitSelectionsDsaRsa
+ )
+ self.ecHighRiskCombo.addItems(CodeStyleCheckerDialog.cryptoBitSelectionsEc)
+ self.ecMediumRiskCombo.addItems(CodeStyleCheckerDialog.cryptoBitSelectionsEc)
+
self.statisticsButton.setEnabled(False)
self.showButton.setEnabled(False)
self.cancelButton.setEnabled(True)
- self.buttonBox.button(
- QDialogButtonBox.StandardButton.Close).setEnabled(False)
-
+ self.buttonBox.button(QDialogButtonBox.StandardButton.Close).setEnabled(False)
+
self.resultList.headerItem().setText(self.resultList.columnCount(), "")
- self.resultList.header().setSortIndicator(
- 0, Qt.SortOrder.AscendingOrder)
-
+ self.resultList.header().setSortIndicator(0, Qt.SortOrder.AscendingOrder)
+
self.addBuiltinButton.setIcon(UI.PixmapCache.getIcon("plus"))
self.deleteBuiltinButton.setIcon(UI.PixmapCache.getIcon("minus"))
self.addWhitelistButton.setIcon(UI.PixmapCache.getIcon("plus"))
self.deleteWhitelistButton.setIcon(UI.PixmapCache.getIcon("minus"))
-
+
self.restartButton.setEnabled(False)
self.fixButton.setEnabled(False)
-
+
self.checkProgress.setVisible(False)
self.checkProgressLabel.setVisible(False)
self.checkProgressLabel.setMaximumWidth(600)
-
+
self.styleCheckService = styleCheckService
self.styleCheckService.styleChecked.connect(self.__processResult)
self.styleCheckService.batchFinished.connect(self.__batchFinished)
self.styleCheckService.error.connect(self.__processError)
self.filename = None
-
+
self.results = CodeStyleCheckerDialog.noResults
self.cancelled = False
self.__lastFileItem = None
@@ -197,7 +185,7 @@
self.__finished = True
self.__errorItem = None
self.__timenow = time.monotonic()
-
+
self.__fileOrFileList = ""
self.__forProject = False
self.__data = {}
@@ -205,16 +193,16 @@
self.__onlyFixes = {}
self.__noFixCodesList = []
self.__detectedCodes = []
-
+
self.on_loadDefaultButton_clicked()
-
+
self.mainWidget.setCurrentWidget(self.configureTab)
self.optionsTabWidget.setCurrentWidget(self.globalOptionsTab)
-
+
def __defaultStatistics(self):
"""
Private method to return the default statistics entry.
-
+
@return dictionary with default statistics entry
@rtype dict
"""
@@ -222,41 +210,39 @@
"total": 0,
"ignored": 0,
}
-
+
def __resort(self):
"""
Private method to resort the tree.
"""
- self.resultList.sortItems(self.resultList.sortColumn(),
- self.resultList.header().sortIndicatorOrder()
- )
-
+ self.resultList.sortItems(
+ self.resultList.sortColumn(), self.resultList.header().sortIndicatorOrder()
+ )
+
def __createErrorItem(self, filename, message):
"""
Private slot to create a new error item in the result list.
-
+
@param filename name of the file
@type str
@param message error message
@type str
"""
if self.__errorItem is None:
- self.__errorItem = QTreeWidgetItem(self.resultList, [
- self.tr("Errors")])
+ self.__errorItem = QTreeWidgetItem(self.resultList, [self.tr("Errors")])
self.__errorItem.setExpanded(True)
self.__errorItem.setForeground(0, Qt.GlobalColor.red)
-
- msg = "{0} ({1})".format(self.__project.getRelativePath(filename),
- message)
+
+ msg = "{0} ({1})".format(self.__project.getRelativePath(filename), message)
if not self.resultList.findItems(msg, Qt.MatchFlag.MatchExactly):
itm = QTreeWidgetItem(self.__errorItem, [msg])
itm.setForeground(0, Qt.GlobalColor.red)
itm.setFirstColumnSpanned(True)
-
+
def __createFileErrorItem(self, filename, message):
"""
Private method to create an error entry for a given file.
-
+
@param filename file name of the file
@type str
@param message error message text
@@ -274,11 +260,11 @@
"ignored": False,
}
self.__createResultItem(filename, result)
-
+
def __createResultItem(self, filename, result):
"""
Private method to create an entry in the result list.
-
+
@param filename file name of the file
@type str
@param result dictionary containing check result data
@@ -287,47 +273,44 @@
@rtype QTreeWidgetItem
"""
from .CodeStyleFixer import FixableCodeStyleIssues
-
+
if self.__lastFileItem is None:
# It's a new file
- self.__lastFileItem = QTreeWidgetItem(self.resultList, [
- self.__project.getRelativePath(filename)])
+ self.__lastFileItem = QTreeWidgetItem(
+ self.resultList, [self.__project.getRelativePath(filename)]
+ )
self.__lastFileItem.setFirstColumnSpanned(True)
self.__lastFileItem.setExpanded(True)
self.__lastFileItem.setData(0, self.filenameRole, filename)
-
+
msgCode = result["code"].split(".", 1)[0]
self.__detectedCodes.append(msgCode)
-
+
fixable = False
itm = QTreeWidgetItem(
- self.__lastFileItem, [
- "{0:6}".format(result["line"]),
- msgCode,
- result["display"]
- ]
+ self.__lastFileItem,
+ ["{0:6}".format(result["line"]), msgCode, result["display"]],
)
-
- CodeStyleCheckerUtilities.setItemIcon(
- itm, 1, msgCode, result.get("severity"))
-
+
+ CodeStyleCheckerUtilities.setItemIcon(itm, 1, msgCode, result.get("severity"))
+
if result["fixed"]:
itm.setIcon(0, UI.PixmapCache.getIcon("issueFixed"))
elif (
- msgCode in FixableCodeStyleIssues and
- not result["autofixing"] and
- msgCode not in self.__noFixCodesList
+ msgCode in FixableCodeStyleIssues
+ and not result["autofixing"]
+ and msgCode not in self.__noFixCodesList
):
itm.setIcon(0, UI.PixmapCache.getIcon("issueFixable"))
fixable = True
-
+
itm.setTextAlignment(0, Qt.AlignmentFlag.AlignRight)
itm.setTextAlignment(1, Qt.AlignmentFlag.AlignHCenter)
-
+
itm.setTextAlignment(0, Qt.AlignmentFlag.AlignVCenter)
itm.setTextAlignment(1, Qt.AlignmentFlag.AlignVCenter)
itm.setTextAlignment(2, Qt.AlignmentFlag.AlignVCenter)
-
+
itm.setData(0, self.filenameRole, filename)
itm.setData(0, self.lineRole, int(result["line"]))
itm.setData(0, self.positionRole, int(result["offset"]))
@@ -336,20 +319,20 @@
itm.setData(0, self.codeRole, msgCode)
itm.setData(0, self.ignoredRole, result["ignored"])
itm.setData(0, self.argsRole, result["args"])
-
+
if result["ignored"]:
font = itm.font(0)
font.setItalic(True)
for col in range(itm.columnCount()):
itm.setFont(col, font)
-
+
return itm
-
+
def __modifyFixedResultItem(self, itm, result):
"""
Private method to modify a result list entry to show its
positive fixed state.
-
+
@param itm reference to the item to modify
@type QTreeWidgetItem
@param result dictionary containing check result data
@@ -358,16 +341,16 @@
if result["fixed"]:
itm.setText(2, result["display"])
itm.setIcon(0, UI.PixmapCache.getIcon("issueFixed"))
-
+
itm.setData(0, self.messageRole, result["display"])
else:
itm.setIcon(0, QIcon())
itm.setData(0, self.fixableRole, False)
-
+
def __updateStatistics(self, statistics, fixer, ignoredErrors, securityOk):
"""
Private method to update the collected statistics.
-
+
@param statistics dictionary of statistical data with
message code as key and message count as value
@type dict
@@ -388,16 +371,16 @@
self.__statistics[key]["ignored"] += ignoredErrors[key]
self.__statistics["_IssuesFixed"] += fixer
self.__statistics["_SecurityOK"] += securityOk
-
+
def __updateFixerStatistics(self, fixer):
"""
Private method to update the collected fixer related statistics.
-
+
@param fixer reference to the code style fixer
@type CodeStyleFixer
"""
self.__statistics["_IssuesFixed"] += fixer
-
+
def __resetStatistics(self):
"""
Private slot to reset the statistics data.
@@ -407,11 +390,11 @@
self.__statistics["_FilesIssues"] = 0
self.__statistics["_IssuesFixed"] = 0
self.__statistics["_SecurityOK"] = 0
-
+
def __getBanRelativeImportsValue(self):
"""
Private method to get the value corresponding the selected button.
-
+
@return value for the BanRelativeImports argument
@rtype str
"""
@@ -421,12 +404,12 @@
return "true"
else:
return ""
-
+
def __setBanRelativeImports(self, value):
"""
Private method to set the button according to the ban relative imports
setting.
-
+
@param value value of the ban relative imports setting
@type str
"""
@@ -436,11 +419,11 @@
self.banAllButton.setChecked(True)
else:
self.allowAllButton.setChecked(True)
-
+
def prepare(self, fileList, project):
"""
Public method to prepare the dialog with a list of filenames.
-
+
@param fileList list of filenames
@type list of str
@param project reference to the project object
@@ -449,18 +432,13 @@
self.__fileOrFileList = fileList[:]
self.__project = project
self.__forProject = True
-
- self.buttonBox.button(
- QDialogButtonBox.StandardButton.Close).setEnabled(True)
- self.buttonBox.button(
- QDialogButtonBox.StandardButton.Close).setDefault(True)
+
+ self.buttonBox.button(QDialogButtonBox.StandardButton.Close).setEnabled(True)
+ self.buttonBox.button(QDialogButtonBox.StandardButton.Close).setDefault(True)
self.cancelButton.setEnabled(False)
-
+
self.__data = self.__project.getData("CHECKERSPARMS", "Pep8Checker")
- if (
- self.__data is None or
- len(self.__data) < 6
- ):
+ if self.__data is None or len(self.__data) < 6:
# initialize the data structure
self.__data = {
"ExcludeFiles": "",
@@ -472,7 +450,8 @@
}
if "EnabledCheckerCategories" not in self.__data:
self.__data["EnabledCheckerCategories"] = ",".join(
- CodeStyleCheckerDialog.checkCategories.keys())
+ CodeStyleCheckerDialog.checkCategories.keys()
+ )
if "MaxLineLength" not in self.__data:
self.__data["MaxLineLength"] = 88
# better code formatting than pycodestyle.MAX_LINE_LENGTH
@@ -497,95 +476,101 @@
if "LineComplexityScore" not in self.__data:
self.__data["LineComplexityScore"] = 10
if "ValidEncodings" not in self.__data:
- self.__data["ValidEncodings"] = (
- MiscellaneousCheckerDefaultArgs["CodingChecker"]
- )
+ self.__data["ValidEncodings"] = MiscellaneousCheckerDefaultArgs[
+ "CodingChecker"
+ ]
if (
- "CopyrightMinFileSize" not in self.__data or
- "CopyrightAuthor" not in self.__data
+ "CopyrightMinFileSize" not in self.__data
+ or "CopyrightAuthor" not in self.__data
):
- self.__data["CopyrightMinFileSize"] = (
- MiscellaneousCheckerDefaultArgs[
- "CopyrightChecker"]["MinFilesize"]
- )
- self.__data["CopyrightAuthor"] = (
- MiscellaneousCheckerDefaultArgs["CopyrightChecker"]["Author"]
- )
+ self.__data["CopyrightMinFileSize"] = MiscellaneousCheckerDefaultArgs[
+ "CopyrightChecker"
+ ]["MinFilesize"]
+ self.__data["CopyrightAuthor"] = MiscellaneousCheckerDefaultArgs[
+ "CopyrightChecker"
+ ]["Author"]
if "FutureChecker" not in self.__data:
self.__data["FutureChecker"] = ""
if "BuiltinsChecker" not in self.__data:
self.__data["BuiltinsChecker"] = copy.deepcopy(
MiscellaneousCheckerDefaultArgs["BuiltinsChecker"]
)
-
+
if "CommentedCodeChecker" not in self.__data:
self.__data["CommentedCodeChecker"] = copy.deepcopy(
MiscellaneousCheckerDefaultArgs["CommentedCodeChecker"]
)
if "WhiteList" not in self.__data["CommentedCodeChecker"]:
- self.__data["CommentedCodeChecker"]["WhiteList"] = (
- MiscellaneousCheckerDefaultArgs[
- "CommentedCodeChecker"]["WhiteList"][:]
- )
-
+ self.__data["CommentedCodeChecker"][
+ "WhiteList"
+ ] = MiscellaneousCheckerDefaultArgs["CommentedCodeChecker"]["WhiteList"][:]
+
if "AnnotationsChecker" not in self.__data:
self.__data["AnnotationsChecker"] = copy.deepcopy(
- AnnotationsCheckerDefaultArgs)
+ AnnotationsCheckerDefaultArgs
+ )
else:
# We are upgrading from an older data structure
if "MaximumLength" not in self.__data["AnnotationsChecker"]:
# MaximumLength is the sentinel for the first extension
- self.__data["AnnotationsChecker"].update({
- "MaximumLength":
- AnnotationsCheckerDefaultArgs["MaximumLength"],
- "SuppressNoneReturning":
- AnnotationsCheckerDefaultArgs["SuppressNoneReturning"],
- "SuppressDummyArgs":
- AnnotationsCheckerDefaultArgs["SuppressDummyArgs"],
- "AllowUntypedDefs":
- AnnotationsCheckerDefaultArgs["AllowUntypedDefs"],
- "AllowUntypedNested":
- AnnotationsCheckerDefaultArgs["AllowUntypedNested"],
- "MypyInitReturn":
- AnnotationsCheckerDefaultArgs["MypyInitReturn"],
- "DispatchDecorators":
- AnnotationsCheckerDefaultArgs["DispatchDecorators"],
- "OverloadDecorators":
- AnnotationsCheckerDefaultArgs["OverloadDecorators"],
- })
-
+ self.__data["AnnotationsChecker"].update(
+ {
+ "MaximumLength": AnnotationsCheckerDefaultArgs["MaximumLength"],
+ "SuppressNoneReturning": AnnotationsCheckerDefaultArgs[
+ "SuppressNoneReturning"
+ ],
+ "SuppressDummyArgs": AnnotationsCheckerDefaultArgs[
+ "SuppressDummyArgs"
+ ],
+ "AllowUntypedDefs": AnnotationsCheckerDefaultArgs[
+ "AllowUntypedDefs"
+ ],
+ "AllowUntypedNested": AnnotationsCheckerDefaultArgs[
+ "AllowUntypedNested"
+ ],
+ "MypyInitReturn": AnnotationsCheckerDefaultArgs[
+ "MypyInitReturn"
+ ],
+ "DispatchDecorators": AnnotationsCheckerDefaultArgs[
+ "DispatchDecorators"
+ ],
+ "OverloadDecorators": AnnotationsCheckerDefaultArgs[
+ "OverloadDecorators"
+ ],
+ }
+ )
+
if "SecurityChecker" not in self.__data:
from .Security.SecurityDefaults import SecurityDefaults
+
self.__data["SecurityChecker"] = {
- "HardcodedTmpDirectories":
- SecurityDefaults["hardcoded_tmp_directories"],
- "InsecureHashes":
- SecurityDefaults["insecure_hashes"],
- "InsecureSslProtocolVersions":
- SecurityDefaults["insecure_ssl_protocol_versions"],
- "WeakKeySizeDsaHigh":
- str(SecurityDefaults["weak_key_size_dsa_high"]),
- "WeakKeySizeDsaMedium":
- str(SecurityDefaults["weak_key_size_dsa_medium"]),
- "WeakKeySizeRsaHigh":
- str(SecurityDefaults["weak_key_size_rsa_high"]),
- "WeakKeySizeRsaMedium":
- str(SecurityDefaults["weak_key_size_rsa_medium"]),
- "WeakKeySizeEcHigh":
- str(SecurityDefaults["weak_key_size_ec_high"]),
- "WeakKeySizeEcMedium":
- str(SecurityDefaults["weak_key_size_ec_medium"]),
- "CheckTypedException":
- SecurityDefaults["check_typed_exception"],
+ "HardcodedTmpDirectories": SecurityDefaults[
+ "hardcoded_tmp_directories"
+ ],
+ "InsecureHashes": SecurityDefaults["insecure_hashes"],
+ "InsecureSslProtocolVersions": SecurityDefaults[
+ "insecure_ssl_protocol_versions"
+ ],
+ "WeakKeySizeDsaHigh": str(SecurityDefaults["weak_key_size_dsa_high"]),
+ "WeakKeySizeDsaMedium": str(
+ SecurityDefaults["weak_key_size_dsa_medium"]
+ ),
+ "WeakKeySizeRsaHigh": str(SecurityDefaults["weak_key_size_rsa_high"]),
+ "WeakKeySizeRsaMedium": str(
+ SecurityDefaults["weak_key_size_rsa_medium"]
+ ),
+ "WeakKeySizeEcHigh": str(SecurityDefaults["weak_key_size_ec_high"]),
+ "WeakKeySizeEcMedium": str(SecurityDefaults["weak_key_size_ec_medium"]),
+ "CheckTypedException": SecurityDefaults["check_typed_exception"],
}
-
+
if "ImportsChecker" not in self.__data:
self.__data["ImportsChecker"] = {
"ApplicationPackageNames": [],
"BannedModules": [],
"BanRelativeImports": "",
}
-
+
self.__initCategoriesList(self.__data["EnabledCheckerCategories"])
self.excludeFilesEdit.setText(self.__data["ExcludeFiles"])
self.excludeMessagesEdit.setText(self.__data["ExcludeMessages"])
@@ -601,70 +586,89 @@
self.blankBeforeMethodSpinBox.setValue(self.__data["BlankLines"][1])
self.hangClosingCheckBox.setChecked(self.__data["HangClosing"])
self.docTypeComboBox.setCurrentIndex(
- self.docTypeComboBox.findData(self.__data["DocstringType"]))
+ self.docTypeComboBox.findData(self.__data["DocstringType"])
+ )
self.complexitySpinBox.setValue(self.__data["MaxCodeComplexity"])
self.lineComplexitySpinBox.setValue(self.__data["LineComplexity"])
- self.lineComplexityScoreSpinBox.setValue(
- self.__data["LineComplexityScore"])
+ self.lineComplexityScoreSpinBox.setValue(self.__data["LineComplexityScore"])
self.encodingsEdit.setText(self.__data["ValidEncodings"])
- self.copyrightFileSizeSpinBox.setValue(
- self.__data["CopyrightMinFileSize"])
+ self.copyrightFileSizeSpinBox.setValue(self.__data["CopyrightMinFileSize"])
self.copyrightAuthorEdit.setText(self.__data["CopyrightAuthor"])
self.__initFuturesList(self.__data["FutureChecker"])
self.__initBuiltinsIgnoreList(self.__data["BuiltinsChecker"])
self.aggressiveCheckBox.setChecked(
- self.__data["CommentedCodeChecker"]["Aggressive"])
+ self.__data["CommentedCodeChecker"]["Aggressive"]
+ )
self.__initCommentedCodeCheckerWhiteList(
- self.__data["CommentedCodeChecker"]["WhiteList"])
-
+ self.__data["CommentedCodeChecker"]["WhiteList"]
+ )
+
# type annotations
self.minAnnotationsCoverageSpinBox.setValue(
- self.__data["AnnotationsChecker"]["MinimumCoverage"])
+ self.__data["AnnotationsChecker"]["MinimumCoverage"]
+ )
self.maxAnnotationsComplexitySpinBox.setValue(
- self.__data["AnnotationsChecker"]["MaximumComplexity"])
+ self.__data["AnnotationsChecker"]["MaximumComplexity"]
+ )
self.maxAnnotationsLengthSpinBox.setValue(
- self.__data["AnnotationsChecker"]["MaximumLength"])
+ self.__data["AnnotationsChecker"]["MaximumLength"]
+ )
self.suppressNoneReturningCheckBox.setChecked(
- self.__data["AnnotationsChecker"]["SuppressNoneReturning"])
+ self.__data["AnnotationsChecker"]["SuppressNoneReturning"]
+ )
self.suppressDummyArgsCheckBox.setChecked(
- self.__data["AnnotationsChecker"]["SuppressDummyArgs"])
+ self.__data["AnnotationsChecker"]["SuppressDummyArgs"]
+ )
self.allowUntypedDefsCheckBox.setChecked(
- self.__data["AnnotationsChecker"]["AllowUntypedDefs"])
+ self.__data["AnnotationsChecker"]["AllowUntypedDefs"]
+ )
self.allowUntypedNestedCheckBox.setChecked(
- self.__data["AnnotationsChecker"]["AllowUntypedNested"])
+ self.__data["AnnotationsChecker"]["AllowUntypedNested"]
+ )
self.mypyInitReturnCheckBox.setChecked(
- self.__data["AnnotationsChecker"]["MypyInitReturn"])
+ self.__data["AnnotationsChecker"]["MypyInitReturn"]
+ )
self.dispatchDecoratorEdit.setText(
- ", ".join(
- self.__data["AnnotationsChecker"]["DispatchDecorators"]))
+ ", ".join(self.__data["AnnotationsChecker"]["DispatchDecorators"])
+ )
self.overloadDecoratorEdit.setText(
- ", ".join(
- self.__data["AnnotationsChecker"]["OverloadDecorators"]))
-
+ ", ".join(self.__data["AnnotationsChecker"]["OverloadDecorators"])
+ )
+
# security
- self.tmpDirectoriesEdit.setPlainText("\n".join(
- self.__data["SecurityChecker"]["HardcodedTmpDirectories"]))
- self.hashesEdit.setText(", ".join(
- self.__data["SecurityChecker"]["InsecureHashes"]))
- self.insecureSslProtocolsEdit.setPlainText("\n".join(
- self.__data["SecurityChecker"]["InsecureSslProtocolVersions"]))
+ self.tmpDirectoriesEdit.setPlainText(
+ "\n".join(self.__data["SecurityChecker"]["HardcodedTmpDirectories"])
+ )
+ self.hashesEdit.setText(
+ ", ".join(self.__data["SecurityChecker"]["InsecureHashes"])
+ )
+ self.insecureSslProtocolsEdit.setPlainText(
+ "\n".join(self.__data["SecurityChecker"]["InsecureSslProtocolVersions"])
+ )
self.dsaHighRiskCombo.setCurrentText(
- self.__data["SecurityChecker"]["WeakKeySizeDsaHigh"])
+ self.__data["SecurityChecker"]["WeakKeySizeDsaHigh"]
+ )
self.dsaMediumRiskCombo.setCurrentText(
- self.__data["SecurityChecker"]["WeakKeySizeDsaMedium"])
+ self.__data["SecurityChecker"]["WeakKeySizeDsaMedium"]
+ )
self.rsaHighRiskCombo.setCurrentText(
- self.__data["SecurityChecker"]["WeakKeySizeRsaHigh"])
+ self.__data["SecurityChecker"]["WeakKeySizeRsaHigh"]
+ )
self.rsaMediumRiskCombo.setCurrentText(
- self.__data["SecurityChecker"]["WeakKeySizeRsaMedium"])
+ self.__data["SecurityChecker"]["WeakKeySizeRsaMedium"]
+ )
self.ecHighRiskCombo.setCurrentText(
- self.__data["SecurityChecker"]["WeakKeySizeEcHigh"])
+ self.__data["SecurityChecker"]["WeakKeySizeEcHigh"]
+ )
self.ecMediumRiskCombo.setCurrentText(
- self.__data["SecurityChecker"]["WeakKeySizeEcMedium"])
+ self.__data["SecurityChecker"]["WeakKeySizeEcMedium"]
+ )
self.typedExceptionsCheckBox.setChecked(
- self.__data["SecurityChecker"]["CheckTypedException"])
-
+ self.__data["SecurityChecker"]["CheckTypedException"]
+ )
+
self.__cleanupData()
-
+
def __prepareProgress(self):
"""
Private method to prepare the progress tab for the next run.
@@ -676,19 +680,21 @@
self.checkProgress.setVisible(len(self.files) > 1)
if len(self.files) > 1:
if self.__project:
- self.progressList.addItems([
- os.path.join("...", self.__project.getRelativePath(f))
- for f in self.files
- ])
+ self.progressList.addItems(
+ [
+ os.path.join("...", self.__project.getRelativePath(f))
+ for f in self.files
+ ]
+ )
else:
self.progressList.addItems(self.files)
-
+
QApplication.processEvents()
-
+
def start(self, fn, save=False, repeat=None):
"""
Public slot to start the code style check.
-
+
@param fn file or list of files or directory to be checked
@type str or list of str
@param save flag indicating to save the given file/file list/directory
@@ -698,12 +704,11 @@
"""
if self.__project is None:
self.__project = ericApp().getObject("Project")
-
+
self.mainWidget.setCurrentWidget(self.progressTab)
-
+
self.cancelled = False
- self.buttonBox.button(
- QDialogButtonBox.StandardButton.Close).setEnabled(False)
+ self.buttonBox.button(QDialogButtonBox.StandardButton.Close).setEnabled(False)
self.cancelButton.setEnabled(True)
self.cancelButton.setDefault(True)
self.statisticsButton.setEnabled(False)
@@ -715,46 +720,44 @@
self.repeatCheckBox.setChecked(repeat)
self.checkProgress.setVisible(True)
QApplication.processEvents()
-
+
if save:
self.__fileOrFileList = fn
-
+
if isinstance(fn, list):
self.files = fn[:]
elif os.path.isdir(fn):
self.files = []
extensions = set(Preferences.getPython("Python3Extensions"))
for ext in extensions:
- self.files.extend(Utilities.direntries(
- fn, True, '*{0}'.format(ext), 0))
+ self.files.extend(Utilities.direntries(fn, True, "*{0}".format(ext), 0))
else:
self.files = [fn]
-
+
# filter the list depending on the filter string
if self.files:
filterString = self.excludeFilesEdit.text()
- filterList = [f.strip() for f in filterString.split(",")
- if f.strip()]
+ filterList = [f.strip() for f in filterString.split(",") if f.strip()]
for fileFilter in filterList:
self.files = [
- f for f in self.files
- if not fnmatch.fnmatch(f, fileFilter.strip())
+ f for f in self.files if not fnmatch.fnmatch(f, fileFilter.strip())
]
-
+
self.__errorItem = None
self.__resetStatistics()
self.__clearErrors(self.files)
self.__cleanupData()
self.__prepareProgress()
-
+
# disable updates of the list for speed
self.resultList.setUpdatesEnabled(False)
self.resultList.setSortingEnabled(False)
-
+
if len(self.files) > 0:
self.securityNoteLabel.setVisible(
- "S" in self.__getCategories(True, asList=True))
-
+ "S" in self.__getCategories(True, asList=True)
+ )
+
# extract the configuration values
excludeMessages = self.__assembleExcludeMessages()
includeMessages = self.includeMessagesEdit.text()
@@ -765,18 +768,15 @@
c.strip() for c in noFixCodes.split(",") if c.strip()
]
fixIssues = self.fixIssuesCheckBox.isChecked() and repeatMessages
- self.showIgnored = (
- self.ignoredCheckBox.isChecked() and repeatMessages
- )
+ self.showIgnored = self.ignoredCheckBox.isChecked() and repeatMessages
maxLineLength = self.lineLengthSpinBox.value()
maxDocLineLength = self.docLineLengthSpinBox.value()
blankLines = (
self.blankBeforeTopLevelSpinBox.value(),
- self.blankBeforeMethodSpinBox.value()
+ self.blankBeforeMethodSpinBox.value(),
)
hangClosing = self.hangClosingCheckBox.isChecked()
- docType = self.docTypeComboBox.itemData(
- self.docTypeComboBox.currentIndex())
+ docType = self.docTypeComboBox.itemData(self.docTypeComboBox.currentIndex())
codeComplexityArgs = {
"McCabeComplexity": self.complexitySpinBox.value(),
"LineComplexity": self.lineComplexitySpinBox.value(),
@@ -793,83 +793,79 @@
"CommentedCodeChecker": {
"Aggressive": self.aggressiveCheckBox.isChecked(),
"WhiteList": self.__getCommentedCodeCheckerWhiteList(),
- }
+ },
}
-
+
annotationArgs = {
- "MinimumCoverage":
- self.minAnnotationsCoverageSpinBox.value(),
- "MaximumComplexity":
- self.maxAnnotationsComplexitySpinBox.value(),
- "MaximumLength":
- self.maxAnnotationsLengthSpinBox.value(),
- "SuppressNoneReturning":
- self.suppressNoneReturningCheckBox.isChecked(),
- "SuppressDummyArgs":
- self.suppressDummyArgsCheckBox.isChecked(),
- "AllowUntypedDefs":
- self.allowUntypedDefsCheckBox.isChecked(),
- "AllowUntypedNested":
- self.allowUntypedNestedCheckBox.isChecked(),
- "MypyInitReturn":
- self.mypyInitReturnCheckBox.isChecked(),
- "DispatchDecorators":
- [d.strip()
- for d in self.dispatchDecoratorEdit.text().split(",")],
- "OverloadDecorators":
- [d.strip()
- for d in self.overloadDecoratorEdit.text().split(",")],
+ "MinimumCoverage": self.minAnnotationsCoverageSpinBox.value(),
+ "MaximumComplexity": self.maxAnnotationsComplexitySpinBox.value(),
+ "MaximumLength": self.maxAnnotationsLengthSpinBox.value(),
+ "SuppressNoneReturning": self.suppressNoneReturningCheckBox.isChecked(),
+ "SuppressDummyArgs": self.suppressDummyArgsCheckBox.isChecked(),
+ "AllowUntypedDefs": self.allowUntypedDefsCheckBox.isChecked(),
+ "AllowUntypedNested": self.allowUntypedNestedCheckBox.isChecked(),
+ "MypyInitReturn": self.mypyInitReturnCheckBox.isChecked(),
+ "DispatchDecorators": [
+ d.strip() for d in self.dispatchDecoratorEdit.text().split(",")
+ ],
+ "OverloadDecorators": [
+ d.strip() for d in self.overloadDecoratorEdit.text().split(",")
+ ],
}
-
+
securityArgs = {
"hardcoded_tmp_directories": [
t.strip()
for t in self.tmpDirectoriesEdit.toPlainText().splitlines()
],
"insecure_hashes": [
- h.strip()
- for h in self.hashesEdit.text().split(",")
+ h.strip() for h in self.hashesEdit.text().split(",")
],
"insecure_ssl_protocol_versions": [
p.strip()
- for p in self.insecureSslProtocolsEdit.toPlainText()
- .splitlines()
+ for p in self.insecureSslProtocolsEdit.toPlainText().splitlines()
],
- "weak_key_size_dsa_high":
- int(self.dsaHighRiskCombo.currentText()),
- "weak_key_size_dsa_medium":
- int(self.dsaMediumRiskCombo.currentText()),
- "weak_key_size_rsa_high":
- int(self.rsaHighRiskCombo.currentText()),
- "weak_key_size_rsa_medium":
- int(self.rsaMediumRiskCombo.currentText()),
- "weak_key_size_ec_high":
- int(self.ecHighRiskCombo.currentText()),
- "weak_key_size_ec_medium":
- int(self.ecMediumRiskCombo.currentText()),
- "check_typed_exception":
- self.typedExceptionsCheckBox.isChecked(),
+ "weak_key_size_dsa_high": int(self.dsaHighRiskCombo.currentText()),
+ "weak_key_size_dsa_medium": int(self.dsaMediumRiskCombo.currentText()),
+ "weak_key_size_rsa_high": int(self.rsaHighRiskCombo.currentText()),
+ "weak_key_size_rsa_medium": int(self.rsaMediumRiskCombo.currentText()),
+ "weak_key_size_ec_high": int(self.ecHighRiskCombo.currentText()),
+ "weak_key_size_ec_medium": int(self.ecMediumRiskCombo.currentText()),
+ "check_typed_exception": self.typedExceptionsCheckBox.isChecked(),
}
-
+
importsArgs = {
- "ApplicationPackageNames":
- sorted(self.appPackagesEdit.toPlainText().split()),
- "BannedModules":
- sorted(self.bannedModulesEdit.toPlainText().split()),
+ "ApplicationPackageNames": sorted(
+ self.appPackagesEdit.toPlainText().split()
+ ),
+ "BannedModules": sorted(self.bannedModulesEdit.toPlainText().split()),
"BanRelativeImports": self.__getBanRelativeImportsValue(),
}
-
- self.__options = [excludeMessages, includeMessages, repeatMessages,
- fixCodes, noFixCodes, fixIssues, maxLineLength,
- maxDocLineLength, blankLines, hangClosing,
- docType, codeComplexityArgs, miscellaneousArgs,
- annotationArgs, securityArgs, importsArgs]
-
+
+ self.__options = [
+ excludeMessages,
+ includeMessages,
+ repeatMessages,
+ fixCodes,
+ noFixCodes,
+ fixIssues,
+ maxLineLength,
+ maxDocLineLength,
+ blankLines,
+ hangClosing,
+ docType,
+ codeComplexityArgs,
+ miscellaneousArgs,
+ annotationArgs,
+ securityArgs,
+ importsArgs,
+ ]
+
# now go through all the files
self.progress = 0
self.files.sort()
self.__timenow = time.monotonic()
-
+
if len(self.files) == 1:
self.__batch = False
self.mainWidget.setCurrentWidget(self.resultsTab)
@@ -881,15 +877,15 @@
self.results = CodeStyleCheckerDialog.noFiles
self.__finished = False
self.__finish()
-
+
def __modifyOptions(self, source):
"""
Private method to modify the options based on eflag: entries.
-
+
This method looks for comment lines like '# eflag: noqa = M601'
at the end of the source in order to extend the list of excluded
messages for one file only.
-
+
@param source source text
@type list of str or str
@return list of checker options
@@ -904,13 +900,13 @@
excludeMessages += flags["noqa"]
options[0] = excludeMessages
return options
-
- def check(self, codestring=''):
+
+ def check(self, codestring=""):
"""
Public method to start a style check for one file.
-
+
The results are reported to the __processResult slot.
-
+
@param codestring optional sourcestring
@type str
"""
@@ -920,7 +916,7 @@
self.checkProgress.setValue(1)
self.__finish()
return
-
+
self.filename = self.files.pop(0)
self.checkProgress.setValue(self.progress)
self.checkProgressLabel.setPath(self.filename)
@@ -929,16 +925,15 @@
if self.cancelled:
self.__resort()
return
-
+
self.__lastFileItem = None
-
+
if codestring:
source = codestring.splitlines(True)
encoding = Utilities.get_coding(source)
else:
try:
- source, encoding = Utilities.readEncodedFile(
- self.filename)
+ source, encoding = Utilities.readEncodedFile(self.filename)
source = source.splitlines(True)
except (UnicodeError, OSError) as msg:
self.results = CodeStyleCheckerDialog.hasResults
@@ -947,79 +942,80 @@
# Continue with next file
self.check()
return
- if encoding.endswith(
- ('-selected', '-default', '-guessed', '-ignore')):
- encoding = encoding.rsplit('-', 1)[0]
-
+ if encoding.endswith(("-selected", "-default", "-guessed", "-ignore")):
+ encoding = encoding.rsplit("-", 1)[0]
+
options = self.__modifyOptions(source)
-
+
errors = []
self.__itms = []
for error, itm in self.__onlyFixes.pop(self.filename, []):
errors.append(error)
self.__itms.append(itm)
-
+
eol = self.__getEol(self.filename)
args = options + [
- errors, eol, encoding, Preferences.getEditor("CreateBackupFile")
+ errors,
+ eol,
+ encoding,
+ Preferences.getEditor("CreateBackupFile"),
]
self.__finished = False
- self.styleCheckService.styleCheck(
- None, self.filename, source, args)
-
+ self.styleCheckService.styleCheck(None, self.filename, source, args)
+
def checkBatch(self):
"""
Public method to start a style check batch job.
-
+
The results are reported to the __processResult slot.
"""
self.__lastFileItem = None
-
+
self.checkProgressLabel.setPath(self.tr("Preparing files..."))
-
+
argumentsList = []
for progress, filename in enumerate(self.files, start=1):
self.checkProgress.setValue(progress)
if time.monotonic() - self.__timenow > 0.01:
QApplication.processEvents()
self.__timenow = time.monotonic()
-
+
try:
- source, encoding = Utilities.readEncodedFile(
- filename)
+ source, encoding = Utilities.readEncodedFile(filename)
source = source.splitlines(True)
except (UnicodeError, OSError) as msg:
self.results = CodeStyleCheckerDialog.hasResults
self.__createFileErrorItem(filename, str(msg))
continue
-
- if encoding.endswith(
- ('-selected', '-default', '-guessed', '-ignore')):
- encoding = encoding.rsplit('-', 1)[0]
-
+
+ if encoding.endswith(("-selected", "-default", "-guessed", "-ignore")):
+ encoding = encoding.rsplit("-", 1)[0]
+
options = self.__modifyOptions(source)
-
+
errors = []
self.__itms = []
for error, itm in self.__onlyFixes.pop(filename, []):
errors.append(error)
self.__itms.append(itm)
-
+
eol = self.__getEol(filename)
args = options + [
- errors, eol, encoding,
- Preferences.getEditor("CreateBackupFile")
+ errors,
+ eol,
+ encoding,
+ Preferences.getEditor("CreateBackupFile"),
]
argumentsList.append((filename, source, args))
-
+
# reset the progress bar to the checked files
self.checkProgress.setValue(self.progress)
self.checkProgressLabel.setPath(self.tr("Transferring data..."))
QApplication.processEvents()
-
+
self.__finished = False
self.styleCheckService.styleBatchCheck(argumentsList)
-
+
def __batchFinished(self):
"""
Private slot handling the completion of a batch job.
@@ -1028,25 +1024,25 @@
self.checkProgress.setMaximum(1)
self.checkProgress.setValue(1)
self.__finish()
-
+
def __processError(self, fn, msg):
"""
Private slot to process an error indication from the service.
-
+
@param fn filename of the file
@type str
@param msg error message
@type str
"""
self.__createErrorItem(fn, msg)
-
+
if not self.__batch:
self.check()
-
+
def __processResult(self, fn, codeStyleCheckerStats, fixes, results):
"""
Private slot called after perfoming a style check on one file.
-
+
@param fn filename of the just checked file
@type str
@param codeStyleCheckerStats stats of style and name check
@@ -1058,12 +1054,12 @@
"""
if self.__finished:
return
-
+
# Check if it's the requested file, otherwise ignore signal if not
# in batch mode
if not self.__batch and fn != self.filename:
return
-
+
fixed = None
ignoredErrors = collections.defaultdict(int)
securityOk = 0
@@ -1073,63 +1069,64 @@
self.__updateFixerStatistics(fixes)
else:
self.__lastFileItem = None
-
+
for result in results:
if result["ignored"]:
ignoredErrors[result["code"]] += 1
if self.showIgnored:
- result["display"] = self.tr(
- "{0} (ignored)"
- ).format(result["display"])
+ result["display"] = self.tr("{0} (ignored)").format(
+ result["display"]
+ )
else:
continue
-
+
elif result["securityOk"]:
securityOk += 1
if result["code"].startswith("S"):
continue
-
+
self.results = CodeStyleCheckerDialog.hasResults
self.__createResultItem(fn, result)
-
+
self.__updateStatistics(
- codeStyleCheckerStats, fixes, ignoredErrors, securityOk)
-
+ codeStyleCheckerStats, fixes, ignoredErrors, securityOk
+ )
+
if fixed:
vm = ericApp().getObject("ViewManager")
editor = vm.getOpenEditor(fn)
if editor:
editor.refresh()
-
+
self.progress += 1
self.__updateProgress(fn)
-
+
if not self.__batch:
self.check()
-
+
def __updateProgress(self, fn):
"""
Private method to update the progress tab.
-
+
@param fn filename of the just checked file
@type str
"""
if self.__project:
fn = os.path.join("...", self.__project.getRelativePath(fn))
-
+
self.checkProgress.setValue(self.progress)
self.checkProgressLabel.setPath(fn)
-
+
# remove file from the list of jobs to do
fileItems = self.progressList.findItems(fn, Qt.MatchFlag.MatchExactly)
if fileItems:
row = self.progressList.row(fileItems[0])
self.progressList.takeItem(row)
-
+
if time.monotonic() - self.__timenow > 0.01:
QApplication.processEvents()
self.__timenow = time.monotonic()
-
+
def __finish(self):
"""
Private slot called when the code style check finished or the user
@@ -1137,26 +1134,28 @@
"""
if not self.__finished:
self.__finished = True
-
+
self.cancelled = True
- self.buttonBox.button(
- QDialogButtonBox.StandardButton.Close).setEnabled(True)
- self.buttonBox.button(
- QDialogButtonBox.StandardButton.Close).setDefault(True)
+ self.buttonBox.button(QDialogButtonBox.StandardButton.Close).setEnabled(
+ True
+ )
+ self.buttonBox.button(QDialogButtonBox.StandardButton.Close).setDefault(
+ True
+ )
self.cancelButton.setEnabled(False)
self.statisticsButton.setEnabled(True)
self.showButton.setEnabled(True)
self.startButton.setEnabled(True)
self.restartButton.setEnabled(True)
-
+
if self.results != CodeStyleCheckerDialog.hasResults:
if self.results == CodeStyleCheckerDialog.noResults:
- QTreeWidgetItem(
- self.resultList, [self.tr('No issues found.')])
+ QTreeWidgetItem(self.resultList, [self.tr("No issues found.")])
else:
QTreeWidgetItem(
self.resultList,
- [self.tr('No files found (check your ignore list).')])
+ [self.tr("No files found (check your ignore list).")],
+ )
QApplication.processEvents()
self.showButton.setEnabled(False)
else:
@@ -1164,26 +1163,26 @@
for col in range(self.resultList.columnCount()):
self.resultList.resizeColumnToContents(col)
self.resultList.header().setStretchLastSection(True)
-
+
if self.__detectedCodes:
self.filterComboBox.addItem("")
self.filterComboBox.addItems(sorted(set(self.__detectedCodes)))
self.filterComboBox.setEnabled(True)
self.filterButton.setEnabled(True)
-
+
self.checkProgress.setVisible(False)
self.checkProgressLabel.setVisible(False)
-
+
self.__resort()
self.resultList.setUpdatesEnabled(True)
self.resultList.setSortingEnabled(True)
-
+
self.mainWidget.setCurrentWidget(self.resultsTab)
-
+
def __getEol(self, fn):
"""
Private method to get the applicable eol string.
-
+
@param fn filename where to determine the line ending
@type str
@return eol string
@@ -1195,14 +1194,14 @@
else Utilities.linesep()
)
return eol
-
+
@pyqtSlot()
def on_startButton_clicked(self):
"""
Private slot to start a code style check run.
"""
self.__cleanupData()
-
+
if self.__forProject:
data = {
"EnabledCheckerCategories": self.__getCategories(True),
@@ -1218,11 +1217,12 @@
"MaxDocLineLength": self.docLineLengthSpinBox.value(),
"BlankLines": (
self.blankBeforeTopLevelSpinBox.value(),
- self.blankBeforeMethodSpinBox.value()
+ self.blankBeforeMethodSpinBox.value(),
),
"HangClosing": self.hangClosingCheckBox.isChecked(),
"DocstringType": self.docTypeComboBox.itemData(
- self.docTypeComboBox.currentIndex()),
+ self.docTypeComboBox.currentIndex()
+ ),
"MaxCodeComplexity": self.complexitySpinBox.value(),
"LineComplexity": self.lineComplexitySpinBox.value(),
"LineComplexityScore": self.lineComplexityScoreSpinBox.value(),
@@ -1236,77 +1236,61 @@
"WhiteList": self.__getCommentedCodeCheckerWhiteList(),
},
"AnnotationsChecker": {
- "MinimumCoverage":
- self.minAnnotationsCoverageSpinBox.value(),
- "MaximumComplexity":
- self.maxAnnotationsComplexitySpinBox.value(),
- "MaximumLength":
- self.maxAnnotationsLengthSpinBox.value(),
- "SuppressNoneReturning":
- self.suppressNoneReturningCheckBox.isChecked(),
- "SuppressDummyArgs":
- self.suppressDummyArgsCheckBox.isChecked(),
- "AllowUntypedDefs":
- self.allowUntypedDefsCheckBox.isChecked(),
- "AllowUntypedNested":
- self.allowUntypedNestedCheckBox.isChecked(),
- "MypyInitReturn":
- self.mypyInitReturnCheckBox.isChecked(),
- "DispatchDecorators":
- [d.strip()
- for d in self.dispatchDecoratorEdit.text().split(",")
- ],
- "OverloadDecorators":
- [d.strip()
- for d in self.overloadDecoratorEdit.text().split(",")
- ],
+ "MinimumCoverage": self.minAnnotationsCoverageSpinBox.value(),
+ "MaximumComplexity": self.maxAnnotationsComplexitySpinBox.value(),
+ "MaximumLength": self.maxAnnotationsLengthSpinBox.value(),
+ "SuppressNoneReturning": (
+ self.suppressNoneReturningCheckBox.isChecked()
+ ),
+ "SuppressDummyArgs": self.suppressDummyArgsCheckBox.isChecked(),
+ "AllowUntypedDefs": self.allowUntypedDefsCheckBox.isChecked(),
+ "AllowUntypedNested": self.allowUntypedNestedCheckBox.isChecked(),
+ "MypyInitReturn": self.mypyInitReturnCheckBox.isChecked(),
+ "DispatchDecorators": [
+ d.strip() for d in self.dispatchDecoratorEdit.text().split(",")
+ ],
+ "OverloadDecorators": [
+ d.strip() for d in self.overloadDecoratorEdit.text().split(",")
+ ],
},
"SecurityChecker": {
"HardcodedTmpDirectories": [
t.strip()
- for t in self.tmpDirectoriesEdit.toPlainText()
- .splitlines()
+ for t in self.tmpDirectoriesEdit.toPlainText().splitlines()
],
"InsecureHashes": [
- h.strip()
- for h in self.hashesEdit.text().split(",")
+ h.strip() for h in self.hashesEdit.text().split(",")
],
"InsecureSslProtocolVersions": [
p.strip()
- for p in self.insecureSslProtocolsEdit.toPlainText()
- .splitlines()
+ for p in (
+ self.insecureSslProtocolsEdit.toPlainText().splitlines()
+ )
],
- "WeakKeySizeDsaHigh":
- self.dsaHighRiskCombo.currentText(),
- "WeakKeySizeDsaMedium":
- self.dsaMediumRiskCombo.currentText(),
- "WeakKeySizeRsaHigh":
- self.rsaHighRiskCombo.currentText(),
- "WeakKeySizeRsaMedium":
- self.rsaMediumRiskCombo.currentText(),
- "WeakKeySizeEcHigh":
- self.ecHighRiskCombo.currentText(),
- "WeakKeySizeEcMedium":
- self.ecMediumRiskCombo.currentText(),
- "CheckTypedException":
- self.typedExceptionsCheckBox.isChecked(),
+ "WeakKeySizeDsaHigh": self.dsaHighRiskCombo.currentText(),
+ "WeakKeySizeDsaMedium": self.dsaMediumRiskCombo.currentText(),
+ "WeakKeySizeRsaHigh": self.rsaHighRiskCombo.currentText(),
+ "WeakKeySizeRsaMedium": self.rsaMediumRiskCombo.currentText(),
+ "WeakKeySizeEcHigh": self.ecHighRiskCombo.currentText(),
+ "WeakKeySizeEcMedium": self.ecMediumRiskCombo.currentText(),
+ "CheckTypedException": self.typedExceptionsCheckBox.isChecked(),
},
"ImportsChecker": {
- "ApplicationPackageNames":
- sorted(self.appPackagesEdit.toPlainText().split()),
- "BannedModules":
- sorted(self.bannedModulesEdit.toPlainText().split()),
+ "ApplicationPackageNames": sorted(
+ self.appPackagesEdit.toPlainText().split()
+ ),
+ "BannedModules": sorted(
+ self.bannedModulesEdit.toPlainText().split()
+ ),
"BanRelativeImports": self.__getBanRelativeImportsValue(),
},
}
- if (
- json.dumps(data, sort_keys=True) !=
- json.dumps(self.__data, sort_keys=True)
+ if json.dumps(data, sort_keys=True) != json.dumps(
+ self.__data, sort_keys=True
):
self.__data = data
- self.__project.setData("CHECKERSPARMS", "Pep8Checker",
- self.__data)
-
+ self.__project.setData("CHECKERSPARMS", "Pep8Checker", self.__data)
+
self.resultList.clear()
self.results = CodeStyleCheckerDialog.noResults
self.cancelled = False
@@ -1314,20 +1298,20 @@
self.filterComboBox.clear()
self.filterComboBox.setEnabled(False)
self.filterButton.setEnabled(False)
-
+
self.start(self.__fileOrFileList)
-
+
@pyqtSlot()
def on_restartButton_clicked(self):
"""
Private slot to restart a code style check run.
"""
self.on_startButton_clicked()
-
+
def __selectCodes(self, edit, categories, showFixCodes):
"""
Private method to select message codes via a selection dialog.
-
+
@param edit reference of the line edit to be populated
@type QLineEdit
@param categories list of message categories to omit
@@ -1337,31 +1321,31 @@
@type bool
"""
from .CodeStyleCodeSelectionDialog import CodeStyleCodeSelectionDialog
- dlg = CodeStyleCodeSelectionDialog(edit.text(), categories,
- showFixCodes, self)
+
+ dlg = CodeStyleCodeSelectionDialog(edit.text(), categories, showFixCodes, self)
if dlg.exec() == QDialog.DialogCode.Accepted:
edit.setText(dlg.getSelectedCodes())
-
+
@pyqtSlot()
def on_excludeMessagesSelectButton_clicked(self):
"""
Private slot to select the message codes to be excluded via a
selection dialog.
"""
- self.__selectCodes(self.excludeMessagesEdit,
- self.__getCategories(False, asList=True),
- False)
-
+ self.__selectCodes(
+ self.excludeMessagesEdit, self.__getCategories(False, asList=True), False
+ )
+
@pyqtSlot()
def on_includeMessagesSelectButton_clicked(self):
"""
Private slot to select the message codes to be included via a
selection dialog.
"""
- self.__selectCodes(self.includeMessagesEdit,
- self.__getCategories(True, asList=True),
- False)
-
+ self.__selectCodes(
+ self.includeMessagesEdit, self.__getCategories(True, asList=True), False
+ )
+
@pyqtSlot()
def on_fixIssuesSelectButton_clicked(self):
"""
@@ -1369,7 +1353,7 @@
selection dialog.
"""
self.__selectCodes(self.fixIssuesEdit, [], True)
-
+
@pyqtSlot()
def on_noFixIssuesSelectButton_clicked(self):
"""
@@ -1377,12 +1361,12 @@
selection dialog.
"""
self.__selectCodes(self.noFixIssuesEdit, [], True)
-
+
@pyqtSlot(QTreeWidgetItem, int)
def on_resultList_itemActivated(self, item, column):
"""
Private slot to handle the activation of an item.
-
+
@param item reference to the activated item
@type QTreeWidgetItem
@param column column the item was activated in
@@ -1390,40 +1374,41 @@
"""
if self.results != CodeStyleCheckerDialog.hasResults:
return
-
+
if item.parent():
fn = os.path.abspath(item.data(0, self.filenameRole))
lineno = item.data(0, self.lineRole)
position = item.data(0, self.positionRole)
message = item.data(0, self.messageRole)
code = item.data(0, self.codeRole)
-
+
vm = ericApp().getObject("ViewManager")
vm.openSourceFile(fn, lineno=lineno, pos=position + 1)
editor = vm.getOpenEditor(fn)
-
+
if code in ["E901", "E902"]:
editor.toggleSyntaxError(lineno, 0, True, message, True)
else:
editor.toggleWarning(
- lineno, 0, True, message, warningType=editor.WarningStyle)
-
+ lineno, 0, True, message, warningType=editor.WarningStyle
+ )
+
editor.updateVerticalScrollBar()
-
+
@pyqtSlot()
def on_resultList_itemSelectionChanged(self):
"""
Private slot to change the dialog state depending on the selection.
"""
self.fixButton.setEnabled(len(self.__getSelectedFixableItems()) > 0)
-
+
@pyqtSlot()
def on_showButton_clicked(self):
"""
Private slot to handle the "Show" button press.
"""
vm = ericApp().getObject("ViewManager")
-
+
selectedIndexes = []
for index in range(self.resultList.topLevelItemCount()):
if self.resultList.topLevelItem(index).isSelected():
@@ -1441,216 +1426,344 @@
lineno = citm.data(0, self.lineRole)
message = citm.data(0, self.messageRole)
editor.toggleWarning(
- lineno, 0, True, message, warningType=editor.WarningStyle)
-
+ lineno, 0, True, message, warningType=editor.WarningStyle
+ )
+
# go through the list again to clear warning markers for files,
# that are ok
openFiles = vm.getOpenFilenames()
errorFiles = []
for index in range(self.resultList.topLevelItemCount()):
itm = self.resultList.topLevelItem(index)
- errorFiles.append(
- os.path.abspath(itm.data(0, self.filenameRole)))
+ errorFiles.append(os.path.abspath(itm.data(0, self.filenameRole)))
for file in openFiles:
if file not in errorFiles:
editor = vm.getOpenEditor(file)
editor.clearStyleWarnings()
-
+
editor = vm.activeWindow()
editor.updateVerticalScrollBar()
-
+
@pyqtSlot()
def on_statisticsButton_clicked(self):
"""
Private slot to show the statistics dialog.
"""
from .CodeStyleStatisticsDialog import CodeStyleStatisticsDialog
+
dlg = CodeStyleStatisticsDialog(self.__statistics, self)
dlg.exec()
-
+
@pyqtSlot()
def on_loadDefaultButton_clicked(self):
"""
Private slot to load the default configuration values.
"""
- self.__initCategoriesList(Preferences.getSettings().value(
- "PEP8/EnabledCheckerCategories",
- ",".join(CodeStyleCheckerDialog.checkCategories.keys())))
- self.excludeFilesEdit.setText(Preferences.getSettings().value(
- "PEP8/ExcludeFilePatterns", ""))
- self.excludeMessagesEdit.setText(Preferences.getSettings().value(
- "PEP8/ExcludeMessages", pycodestyle.DEFAULT_IGNORE))
- self.includeMessagesEdit.setText(Preferences.getSettings().value(
- "PEP8/IncludeMessages", ""))
- self.repeatCheckBox.setChecked(Preferences.toBool(
- Preferences.getSettings().value("PEP8/RepeatMessages", False)))
- self.fixIssuesEdit.setText(Preferences.getSettings().value(
- "PEP8/FixCodes", ""))
- self.noFixIssuesEdit.setText(Preferences.getSettings().value(
- "PEP8/NoFixCodes", "E501"))
- self.fixIssuesCheckBox.setChecked(Preferences.toBool(
- Preferences.getSettings().value("PEP8/FixIssues", False)))
- self.ignoredCheckBox.setChecked(Preferences.toBool(
- Preferences.getSettings().value("PEP8/ShowIgnored", False)))
- self.lineLengthSpinBox.setValue(int(
- Preferences.getSettings().value("PEP8/MaxLineLength", 88)))
- self.docLineLengthSpinBox.setValue(int(
- Preferences.getSettings().value("PEP8/MaxDocLineLength", 88)))
+ self.__initCategoriesList(
+ Preferences.getSettings().value(
+ "PEP8/EnabledCheckerCategories",
+ ",".join(CodeStyleCheckerDialog.checkCategories.keys()),
+ )
+ )
+ self.excludeFilesEdit.setText(
+ Preferences.getSettings().value("PEP8/ExcludeFilePatterns", "")
+ )
+ self.excludeMessagesEdit.setText(
+ Preferences.getSettings().value(
+ "PEP8/ExcludeMessages", pycodestyle.DEFAULT_IGNORE
+ )
+ )
+ self.includeMessagesEdit.setText(
+ Preferences.getSettings().value("PEP8/IncludeMessages", "")
+ )
+ self.repeatCheckBox.setChecked(
+ Preferences.toBool(
+ Preferences.getSettings().value("PEP8/RepeatMessages", False)
+ )
+ )
+ self.fixIssuesEdit.setText(Preferences.getSettings().value("PEP8/FixCodes", ""))
+ self.noFixIssuesEdit.setText(
+ Preferences.getSettings().value("PEP8/NoFixCodes", "E501")
+ )
+ self.fixIssuesCheckBox.setChecked(
+ Preferences.toBool(Preferences.getSettings().value("PEP8/FixIssues", False))
+ )
+ self.ignoredCheckBox.setChecked(
+ Preferences.toBool(
+ Preferences.getSettings().value("PEP8/ShowIgnored", False)
+ )
+ )
+ self.lineLengthSpinBox.setValue(
+ int(Preferences.getSettings().value("PEP8/MaxLineLength", 88))
+ )
+ self.docLineLengthSpinBox.setValue(
+ int(Preferences.getSettings().value("PEP8/MaxDocLineLength", 88))
+ )
self.blankBeforeTopLevelSpinBox.setValue(
- int(Preferences.getSettings().value(
- "PEP8/BlankLinesBeforeTopLevel", 2)))
+ int(Preferences.getSettings().value("PEP8/BlankLinesBeforeTopLevel", 2))
+ )
self.blankBeforeMethodSpinBox.setValue(
- int(Preferences.getSettings().value(
- "PEP8/BlankLinesBeforeMethod", 1)))
- self.hangClosingCheckBox.setChecked(Preferences.toBool(
- Preferences.getSettings().value("PEP8/HangClosing", False)))
- self.docTypeComboBox.setCurrentIndex(self.docTypeComboBox.findData(
- Preferences.getSettings().value("PEP8/DocstringType", "pep257")))
- self.complexitySpinBox.setValue(int(Preferences.getSettings().value(
- "PEP8/MaxCodeComplexity", 10)))
+ int(Preferences.getSettings().value("PEP8/BlankLinesBeforeMethod", 1))
+ )
+ self.hangClosingCheckBox.setChecked(
+ Preferences.toBool(
+ Preferences.getSettings().value("PEP8/HangClosing", False)
+ )
+ )
+ self.docTypeComboBox.setCurrentIndex(
+ self.docTypeComboBox.findData(
+ Preferences.getSettings().value("PEP8/DocstringType", "pep257")
+ )
+ )
+ self.complexitySpinBox.setValue(
+ int(Preferences.getSettings().value("PEP8/MaxCodeComplexity", 10))
+ )
self.lineComplexitySpinBox.setValue(
- int(Preferences.getSettings().value(
- "PEP8/LineComplexity", 15)))
+ int(Preferences.getSettings().value("PEP8/LineComplexity", 15))
+ )
self.lineComplexityScoreSpinBox.setValue(
- int(Preferences.getSettings().value(
- "PEP8/LineComplexityScore", 10)))
- self.encodingsEdit.setText(Preferences.getSettings().value(
- "PEP8/ValidEncodings",
- MiscellaneousCheckerDefaultArgs["CodingChecker"]
- ))
- self.copyrightFileSizeSpinBox.setValue(int(
+ int(Preferences.getSettings().value("PEP8/LineComplexityScore", 10))
+ )
+ self.encodingsEdit.setText(
Preferences.getSettings().value(
- "PEP8/CopyrightMinFileSize",
- MiscellaneousCheckerDefaultArgs[
- "CopyrightChecker"]["MinFilesize"]
+ "PEP8/ValidEncodings", MiscellaneousCheckerDefaultArgs["CodingChecker"]
)
- ))
+ )
+ self.copyrightFileSizeSpinBox.setValue(
+ int(
+ Preferences.getSettings().value(
+ "PEP8/CopyrightMinFileSize",
+ MiscellaneousCheckerDefaultArgs["CopyrightChecker"]["MinFilesize"],
+ )
+ )
+ )
self.copyrightAuthorEdit.setText(
Preferences.getSettings().value(
"PEP8/CopyrightAuthor",
- MiscellaneousCheckerDefaultArgs["CopyrightChecker"]["Author"]
+ MiscellaneousCheckerDefaultArgs["CopyrightChecker"]["Author"],
)
)
self.__initFuturesList(
- Preferences.getSettings().value("PEP8/FutureChecker", ""))
- self.__initBuiltinsIgnoreList(Preferences.toDict(
- Preferences.getSettings().value(
- "PEP8/BuiltinsChecker",
- MiscellaneousCheckerDefaultArgs["BuiltinsChecker"]
- ))
+ Preferences.getSettings().value("PEP8/FutureChecker", "")
+ )
+ self.__initBuiltinsIgnoreList(
+ Preferences.toDict(
+ Preferences.getSettings().value(
+ "PEP8/BuiltinsChecker",
+ MiscellaneousCheckerDefaultArgs["BuiltinsChecker"],
+ )
+ )
)
- self.aggressiveCheckBox.setChecked(Preferences.toBool(
- Preferences.getSettings().value(
- "PEP8/AggressiveSearch",
- MiscellaneousCheckerDefaultArgs[
- "CommentedCodeChecker"]["Aggressive"]
- )))
- self.__initCommentedCodeCheckerWhiteList(Preferences.toList(
- Preferences.getSettings().value(
- "PEP8/CommentedCodeWhitelist",
- MiscellaneousCheckerDefaultArgs[
- "CommentedCodeChecker"]["WhiteList"]
+ self.aggressiveCheckBox.setChecked(
+ Preferences.toBool(
+ Preferences.getSettings().value(
+ "PEP8/AggressiveSearch",
+ MiscellaneousCheckerDefaultArgs["CommentedCodeChecker"][
+ "Aggressive"
+ ],
+ )
)
- ))
-
+ )
+ self.__initCommentedCodeCheckerWhiteList(
+ Preferences.toList(
+ Preferences.getSettings().value(
+ "PEP8/CommentedCodeWhitelist",
+ MiscellaneousCheckerDefaultArgs["CommentedCodeChecker"][
+ "WhiteList"
+ ],
+ )
+ )
+ )
+
# Type Annotations Checker
- self.minAnnotationsCoverageSpinBox.setValue(int(
- Preferences.getSettings().value(
- "PEP8/MinimumAnnotationsCoverage",
- AnnotationsCheckerDefaultArgs["MinimumCoverage"])))
- self.maxAnnotationsComplexitySpinBox.setValue(int(
- Preferences.getSettings().value(
- "PEP8/MaximumAnnotationComplexity",
- AnnotationsCheckerDefaultArgs["MaximumComplexity"])))
- self.maxAnnotationsLengthSpinBox.setValue(int(
- Preferences.getSettings().value(
- "PEP8/MaximumAnnotationLength",
- AnnotationsCheckerDefaultArgs["MaximumLength"])))
- self.suppressNoneReturningCheckBox.setChecked(Preferences.toBool(
- Preferences.getSettings().value(
- "PEP8/SuppressNoneReturning",
- AnnotationsCheckerDefaultArgs["SuppressNoneReturning"])))
- self.suppressDummyArgsCheckBox.setChecked(Preferences.toBool(
- Preferences.getSettings().value(
- "PEP8/SuppressDummyArgs",
- AnnotationsCheckerDefaultArgs["SuppressDummyArgs"])))
- self.allowUntypedDefsCheckBox.setChecked(Preferences.toBool(
- Preferences.getSettings().value(
- "PEP8/AllowUntypedDefs",
- AnnotationsCheckerDefaultArgs["AllowUntypedDefs"])))
- self.allowUntypedNestedCheckBox.setChecked(Preferences.toBool(
- Preferences.getSettings().value(
- "PEP8/AllowUntypedNested",
- AnnotationsCheckerDefaultArgs["AllowUntypedNested"])))
- self.mypyInitReturnCheckBox.setChecked(Preferences.toBool(
- Preferences.getSettings().value(
- "PEP8/MypyInitReturn",
- AnnotationsCheckerDefaultArgs["MypyInitReturn"])))
- self.dispatchDecoratorEdit.setText(", ".join(Preferences.toList(
- Preferences.getSettings().value(
- "PEP8/DispatchDecorators",
- AnnotationsCheckerDefaultArgs["DispatchDecorators"]))))
- self.overloadDecoratorEdit.setText(", ".join(Preferences.toList(
- Preferences.getSettings().value(
- "PEP8/OverloadDecorators",
- AnnotationsCheckerDefaultArgs["OverloadDecorators"]))))
-
+ self.minAnnotationsCoverageSpinBox.setValue(
+ int(
+ Preferences.getSettings().value(
+ "PEP8/MinimumAnnotationsCoverage",
+ AnnotationsCheckerDefaultArgs["MinimumCoverage"],
+ )
+ )
+ )
+ self.maxAnnotationsComplexitySpinBox.setValue(
+ int(
+ Preferences.getSettings().value(
+ "PEP8/MaximumAnnotationComplexity",
+ AnnotationsCheckerDefaultArgs["MaximumComplexity"],
+ )
+ )
+ )
+ self.maxAnnotationsLengthSpinBox.setValue(
+ int(
+ Preferences.getSettings().value(
+ "PEP8/MaximumAnnotationLength",
+ AnnotationsCheckerDefaultArgs["MaximumLength"],
+ )
+ )
+ )
+ self.suppressNoneReturningCheckBox.setChecked(
+ Preferences.toBool(
+ Preferences.getSettings().value(
+ "PEP8/SuppressNoneReturning",
+ AnnotationsCheckerDefaultArgs["SuppressNoneReturning"],
+ )
+ )
+ )
+ self.suppressDummyArgsCheckBox.setChecked(
+ Preferences.toBool(
+ Preferences.getSettings().value(
+ "PEP8/SuppressDummyArgs",
+ AnnotationsCheckerDefaultArgs["SuppressDummyArgs"],
+ )
+ )
+ )
+ self.allowUntypedDefsCheckBox.setChecked(
+ Preferences.toBool(
+ Preferences.getSettings().value(
+ "PEP8/AllowUntypedDefs",
+ AnnotationsCheckerDefaultArgs["AllowUntypedDefs"],
+ )
+ )
+ )
+ self.allowUntypedNestedCheckBox.setChecked(
+ Preferences.toBool(
+ Preferences.getSettings().value(
+ "PEP8/AllowUntypedNested",
+ AnnotationsCheckerDefaultArgs["AllowUntypedNested"],
+ )
+ )
+ )
+ self.mypyInitReturnCheckBox.setChecked(
+ Preferences.toBool(
+ Preferences.getSettings().value(
+ "PEP8/MypyInitReturn",
+ AnnotationsCheckerDefaultArgs["MypyInitReturn"],
+ )
+ )
+ )
+ self.dispatchDecoratorEdit.setText(
+ ", ".join(
+ Preferences.toList(
+ Preferences.getSettings().value(
+ "PEP8/DispatchDecorators",
+ AnnotationsCheckerDefaultArgs["DispatchDecorators"],
+ )
+ )
+ )
+ )
+ self.overloadDecoratorEdit.setText(
+ ", ".join(
+ Preferences.toList(
+ Preferences.getSettings().value(
+ "PEP8/OverloadDecorators",
+ AnnotationsCheckerDefaultArgs["OverloadDecorators"],
+ )
+ )
+ )
+ )
+
# Security Checker
from .Security.SecurityDefaults import SecurityDefaults
- self.tmpDirectoriesEdit.setPlainText("\n".join(
- Preferences.toList(Preferences.getSettings().value(
- "PEP8/HardcodedTmpDirectories",
- SecurityDefaults["hardcoded_tmp_directories"]))))
- self.hashesEdit.setText(", ".join(
- Preferences.toList(Preferences.getSettings().value(
- "PEP8/InsecureHashes",
- SecurityDefaults["insecure_hashes"])))),
- self.insecureSslProtocolsEdit.setPlainText("\n".join(
- Preferences.toList(Preferences.getSettings().value(
- "PEP8/InsecureSslProtocolVersions",
- SecurityDefaults["insecure_ssl_protocol_versions"])))),
+
+ self.tmpDirectoriesEdit.setPlainText(
+ "\n".join(
+ Preferences.toList(
+ Preferences.getSettings().value(
+ "PEP8/HardcodedTmpDirectories",
+ SecurityDefaults["hardcoded_tmp_directories"],
+ )
+ )
+ )
+ )
+ self.hashesEdit.setText(
+ ", ".join(
+ Preferences.toList(
+ Preferences.getSettings().value(
+ "PEP8/InsecureHashes", SecurityDefaults["insecure_hashes"]
+ )
+ )
+ )
+ ),
+ self.insecureSslProtocolsEdit.setPlainText(
+ "\n".join(
+ Preferences.toList(
+ Preferences.getSettings().value(
+ "PEP8/InsecureSslProtocolVersions",
+ SecurityDefaults["insecure_ssl_protocol_versions"],
+ )
+ )
+ )
+ ),
self.dsaHighRiskCombo.setCurrentText(
Preferences.getSettings().value(
"PEP8/WeakKeySizeDsaHigh",
- str(SecurityDefaults["weak_key_size_dsa_high"])))
+ str(SecurityDefaults["weak_key_size_dsa_high"]),
+ )
+ )
self.dsaMediumRiskCombo.setCurrentText(
Preferences.getSettings().value(
"PEP8/WeakKeySizeDsaMedium",
- str(SecurityDefaults["weak_key_size_dsa_medium"]))),
+ str(SecurityDefaults["weak_key_size_dsa_medium"]),
+ )
+ ),
self.rsaHighRiskCombo.setCurrentText(
Preferences.getSettings().value(
"PEP8/WeakKeySizeRsaHigh",
- str(SecurityDefaults["weak_key_size_rsa_high"]))),
+ str(SecurityDefaults["weak_key_size_rsa_high"]),
+ )
+ ),
self.rsaMediumRiskCombo.setCurrentText(
Preferences.getSettings().value(
"PEP8/WeakKeySizeRsaMedium",
- str(SecurityDefaults["weak_key_size_rsa_medium"]))),
+ str(SecurityDefaults["weak_key_size_rsa_medium"]),
+ )
+ ),
self.ecHighRiskCombo.setCurrentText(
Preferences.getSettings().value(
- "PEP8/WeakKeySizeEcHigh",
- str(SecurityDefaults["weak_key_size_ec_high"]))),
+ "PEP8/WeakKeySizeEcHigh", str(SecurityDefaults["weak_key_size_ec_high"])
+ )
+ ),
self.ecMediumRiskCombo.setCurrentText(
Preferences.getSettings().value(
"PEP8/WeakKeySizeEcMedium",
- str(SecurityDefaults["weak_key_size_ec_medium"]))),
- self.typedExceptionsCheckBox.setChecked(Preferences.toBool(
- Preferences.getSettings().value(
- "PEP8/CheckTypedException",
- SecurityDefaults["check_typed_exception"]))),
-
+ str(SecurityDefaults["weak_key_size_ec_medium"]),
+ )
+ ),
+ self.typedExceptionsCheckBox.setChecked(
+ Preferences.toBool(
+ Preferences.getSettings().value(
+ "PEP8/CheckTypedException",
+ SecurityDefaults["check_typed_exception"],
+ )
+ )
+ ),
+
# Imports Checker
- self.appPackagesEdit.setPlainText(" ".join(
- sorted(Preferences.toList(Preferences.getSettings().value(
- "PEP8/ApplicationPackageNames", [])))))
- self.bannedModulesEdit.setPlainText(" ".join(
- sorted(Preferences.toList(Preferences.getSettings().value(
- "PEP8/BannedModules", [])))))
+ self.appPackagesEdit.setPlainText(
+ " ".join(
+ sorted(
+ Preferences.toList(
+ Preferences.getSettings().value(
+ "PEP8/ApplicationPackageNames", []
+ )
+ )
+ )
+ )
+ )
+ self.bannedModulesEdit.setPlainText(
+ " ".join(
+ sorted(
+ Preferences.toList(
+ Preferences.getSettings().value("PEP8/BannedModules", [])
+ )
+ )
+ )
+ )
self.__setBanRelativeImports(
- Preferences.getSettings().value(
- "PEP8/BanRelativeImports", ""))
-
+ Preferences.getSettings().value("PEP8/BanRelativeImports", "")
+ )
+
self.__cleanupData()
-
+
@pyqtSlot()
def on_storeDefaultButton_clicked(self):
"""
@@ -1658,144 +1771,166 @@
default values.
"""
Preferences.getSettings().setValue(
- "PEP8/EnabledCheckerCategories", self.__getCategories(True))
+ "PEP8/EnabledCheckerCategories", self.__getCategories(True)
+ )
Preferences.getSettings().setValue(
- "PEP8/ExcludeFilePatterns", self.excludeFilesEdit.text())
- Preferences.getSettings().setValue(
- "PEP8/ExcludeMessages", self.excludeMessagesEdit.text())
+ "PEP8/ExcludeFilePatterns", self.excludeFilesEdit.text()
+ )
Preferences.getSettings().setValue(
- "PEP8/IncludeMessages", self.includeMessagesEdit.text())
- Preferences.getSettings().setValue(
- "PEP8/RepeatMessages", self.repeatCheckBox.isChecked())
+ "PEP8/ExcludeMessages", self.excludeMessagesEdit.text()
+ )
Preferences.getSettings().setValue(
- "PEP8/FixCodes", self.fixIssuesEdit.text())
+ "PEP8/IncludeMessages", self.includeMessagesEdit.text()
+ )
Preferences.getSettings().setValue(
- "PEP8/NoFixCodes", self.noFixIssuesEdit.text())
+ "PEP8/RepeatMessages", self.repeatCheckBox.isChecked()
+ )
+ Preferences.getSettings().setValue("PEP8/FixCodes", self.fixIssuesEdit.text())
Preferences.getSettings().setValue(
- "PEP8/FixIssues", self.fixIssuesCheckBox.isChecked())
+ "PEP8/NoFixCodes", self.noFixIssuesEdit.text()
+ )
Preferences.getSettings().setValue(
- "PEP8/ShowIgnored", self.ignoredCheckBox.isChecked())
+ "PEP8/FixIssues", self.fixIssuesCheckBox.isChecked()
+ )
Preferences.getSettings().setValue(
- "PEP8/MaxLineLength", self.lineLengthSpinBox.value())
+ "PEP8/ShowIgnored", self.ignoredCheckBox.isChecked()
+ )
Preferences.getSettings().setValue(
- "PEP8/MaxDocLineLength", self.docLineLengthSpinBox.value())
+ "PEP8/MaxLineLength", self.lineLengthSpinBox.value()
+ )
+ Preferences.getSettings().setValue(
+ "PEP8/MaxDocLineLength", self.docLineLengthSpinBox.value()
+ )
Preferences.getSettings().setValue(
- "PEP8/BlankLinesBeforeTopLevel",
- self.blankBeforeTopLevelSpinBox.value())
+ "PEP8/BlankLinesBeforeTopLevel", self.blankBeforeTopLevelSpinBox.value()
+ )
Preferences.getSettings().setValue(
- "PEP8/BlankLinesBeforeMethod",
- self.blankBeforeMethodSpinBox.value())
+ "PEP8/BlankLinesBeforeMethod", self.blankBeforeMethodSpinBox.value()
+ )
Preferences.getSettings().setValue(
- "PEP8/HangClosing", self.hangClosingCheckBox.isChecked())
+ "PEP8/HangClosing", self.hangClosingCheckBox.isChecked()
+ )
Preferences.getSettings().setValue(
- "PEP8/DocstringType", self.docTypeComboBox.itemData(
- self.docTypeComboBox.currentIndex()))
- Preferences.getSettings().setValue(
- "PEP8/MaxCodeComplexity", self.complexitySpinBox.value())
+ "PEP8/DocstringType",
+ self.docTypeComboBox.itemData(self.docTypeComboBox.currentIndex()),
+ )
Preferences.getSettings().setValue(
- "PEP8/LineComplexity", self.lineComplexitySpinBox.value())
+ "PEP8/MaxCodeComplexity", self.complexitySpinBox.value()
+ )
+ Preferences.getSettings().setValue(
+ "PEP8/LineComplexity", self.lineComplexitySpinBox.value()
+ )
Preferences.getSettings().setValue(
- "PEP8/LineComplexityScore",
- self.lineComplexityScoreSpinBox.value())
+ "PEP8/LineComplexityScore", self.lineComplexityScoreSpinBox.value()
+ )
Preferences.getSettings().setValue(
- "PEP8/ValidEncodings", self.encodingsEdit.text())
+ "PEP8/ValidEncodings", self.encodingsEdit.text()
+ )
Preferences.getSettings().setValue(
- "PEP8/CopyrightMinFileSize", self.copyrightFileSizeSpinBox.value())
+ "PEP8/CopyrightMinFileSize", self.copyrightFileSizeSpinBox.value()
+ )
Preferences.getSettings().setValue(
- "PEP8/CopyrightAuthor", self.copyrightAuthorEdit.text())
+ "PEP8/CopyrightAuthor", self.copyrightAuthorEdit.text()
+ )
Preferences.getSettings().setValue(
- "PEP8/FutureChecker", self.__getSelectedFutureImports())
+ "PEP8/FutureChecker", self.__getSelectedFutureImports()
+ )
Preferences.getSettings().setValue(
- "PEP8/BuiltinsChecker", self.__getBuiltinsIgnoreList())
- Preferences.getSettings().setValue(
- "PEP8/AggressiveSearch", self.aggressiveCheckBox.isChecked())
+ "PEP8/BuiltinsChecker", self.__getBuiltinsIgnoreList()
+ )
Preferences.getSettings().setValue(
- "PEP8/CommentedCodeWhitelist",
- self.__getCommentedCodeCheckerWhiteList())
-
+ "PEP8/AggressiveSearch", self.aggressiveCheckBox.isChecked()
+ )
+ Preferences.getSettings().setValue(
+ "PEP8/CommentedCodeWhitelist", self.__getCommentedCodeCheckerWhiteList()
+ )
+
# Type Annotations Checker
Preferences.getSettings().setValue(
"PEP8/MinimumAnnotationsCoverage",
- self.minAnnotationsCoverageSpinBox.value())
+ self.minAnnotationsCoverageSpinBox.value(),
+ )
Preferences.getSettings().setValue(
"PEP8/MaximumAnnotationComplexity",
- self.maxAnnotationsComplexitySpinBox.value())
+ self.maxAnnotationsComplexitySpinBox.value(),
+ )
Preferences.getSettings().setValue(
- "PEP8/MaximumAnnotationLength",
- self.maxAnnotationsLengthSpinBox.value())
+ "PEP8/MaximumAnnotationLength", self.maxAnnotationsLengthSpinBox.value()
+ )
Preferences.getSettings().setValue(
- "PEP8/SuppressNoneReturning",
- self.suppressNoneReturningCheckBox.isChecked())
+ "PEP8/SuppressNoneReturning", self.suppressNoneReturningCheckBox.isChecked()
+ )
Preferences.getSettings().setValue(
- "PEP8/SuppressDummyArgs",
- self.suppressDummyArgsCheckBox.isChecked())
+ "PEP8/SuppressDummyArgs", self.suppressDummyArgsCheckBox.isChecked()
+ )
Preferences.getSettings().setValue(
- "PEP8/AllowUntypedDefs",
- self.allowUntypedDefsCheckBox.isChecked())
+ "PEP8/AllowUntypedDefs", self.allowUntypedDefsCheckBox.isChecked()
+ )
Preferences.getSettings().setValue(
- "PEP8/AllowUntypedNested",
- self.allowUntypedNestedCheckBox.isChecked())
+ "PEP8/AllowUntypedNested", self.allowUntypedNestedCheckBox.isChecked()
+ )
Preferences.getSettings().setValue(
- "PEP8/MypyInitReturn",
- self.mypyInitReturnCheckBox.isChecked())
+ "PEP8/MypyInitReturn", self.mypyInitReturnCheckBox.isChecked()
+ )
Preferences.getSettings().setValue(
"PEP8/DispatchDecorators",
- [d.strip()
- for d in self.dispatchDecoratorEdit.text().split(",")])
+ [d.strip() for d in self.dispatchDecoratorEdit.text().split(",")],
+ )
Preferences.getSettings().setValue(
"PEP8/OverloadDecorators",
- [d.strip()
- for d in self.overloadDecoratorEdit.text().split(",")])
-
+ [d.strip() for d in self.overloadDecoratorEdit.text().split(",")],
+ )
+
# Security Checker
Preferences.getSettings().setValue(
"PEP8/HardcodedTmpDirectories",
- [t.strip()
- for t in self.tmpDirectoriesEdit.toPlainText().splitlines()
- ]),
+ [t.strip() for t in self.tmpDirectoriesEdit.toPlainText().splitlines()],
+ ),
Preferences.getSettings().setValue(
"PEP8/InsecureHashes",
- [h.strip()
- for h in self.hashesEdit.text().split(",")
- ]),
+ [h.strip() for h in self.hashesEdit.text().split(",")],
+ ),
Preferences.getSettings().setValue(
"PEP8/InsecureSslProtocolVersions",
- [p.strip()
- for p in self.insecureSslProtocolsEdit.toPlainText().splitlines()
- ]),
+ [
+ p.strip()
+ for p in self.insecureSslProtocolsEdit.toPlainText().splitlines()
+ ],
+ ),
Preferences.getSettings().setValue(
- "PEP8/WeakKeySizeDsaHigh",
- self.dsaHighRiskCombo.currentText()),
+ "PEP8/WeakKeySizeDsaHigh", self.dsaHighRiskCombo.currentText()
+ ),
Preferences.getSettings().setValue(
- "PEP8/WeakKeySizeDsaMedium",
- self.dsaMediumRiskCombo.currentText()),
- Preferences.getSettings().setValue(
- "PEP8/WeakKeySizeRsaHigh",
- self.rsaHighRiskCombo.currentText()),
+ "PEP8/WeakKeySizeDsaMedium", self.dsaMediumRiskCombo.currentText()
+ ),
Preferences.getSettings().setValue(
- "PEP8/WeakKeySizeRsaMedium",
- self.rsaMediumRiskCombo.currentText()),
+ "PEP8/WeakKeySizeRsaHigh", self.rsaHighRiskCombo.currentText()
+ ),
Preferences.getSettings().setValue(
- "PEP8/WeakKeySizeEcHigh",
- self.ecHighRiskCombo.currentText()),
+ "PEP8/WeakKeySizeRsaMedium", self.rsaMediumRiskCombo.currentText()
+ ),
Preferences.getSettings().setValue(
- "PEP8/WeakKeySizeEcMedium",
- self.ecMediumRiskCombo.currentText()),
+ "PEP8/WeakKeySizeEcHigh", self.ecHighRiskCombo.currentText()
+ ),
Preferences.getSettings().setValue(
- "PEP8/CheckTypedException",
- self.typedExceptionsCheckBox.isChecked()),
-
+ "PEP8/WeakKeySizeEcMedium", self.ecMediumRiskCombo.currentText()
+ ),
+ Preferences.getSettings().setValue(
+ "PEP8/CheckTypedException", self.typedExceptionsCheckBox.isChecked()
+ ),
+
# Imports Checker
Preferences.getSettings().setValue(
"PEP8/ApplicationPackageNames",
- sorted(self.appPackagesEdit.toPlainText().split()))
+ sorted(self.appPackagesEdit.toPlainText().split()),
+ )
Preferences.getSettings().setValue(
- "PEP8/BannedModules",
- sorted(self.bannedModulesEdit.toPlainText().split()))
+ "PEP8/BannedModules", sorted(self.bannedModulesEdit.toPlainText().split())
+ )
Preferences.getSettings().setValue(
- "PEP8/BanRelativeImports",
- self.__getBanRelativeImportsValue())
-
+ "PEP8/BanRelativeImports", self.__getBanRelativeImportsValue()
+ )
+
@pyqtSlot()
def on_resetDefaultButton_clicked(self):
"""
@@ -1803,10 +1938,12 @@
"""
Preferences.getSettings().setValue(
"PEP8/EnabledCheckerCategories",
- ",".join(CodeStyleCheckerDialog.checkCategories.keys()))
+ ",".join(CodeStyleCheckerDialog.checkCategories.keys()),
+ )
Preferences.getSettings().setValue("PEP8/ExcludeFilePatterns", "")
Preferences.getSettings().setValue(
- "PEP8/ExcludeMessages", pycodestyle.DEFAULT_IGNORE)
+ "PEP8/ExcludeMessages", pycodestyle.DEFAULT_IGNORE
+ )
Preferences.getSettings().setValue("PEP8/IncludeMessages", "")
Preferences.getSettings().setValue("PEP8/RepeatMessages", False)
Preferences.getSettings().setValue("PEP8/FixCodes", "")
@@ -1823,109 +1960,114 @@
Preferences.getSettings().setValue("PEP8/LineComplexity", 15)
Preferences.getSettings().setValue("PEP8/LineComplexityScore", 10)
Preferences.getSettings().setValue(
- "PEP8/ValidEncodings",
- MiscellaneousCheckerDefaultArgs["CodingChecker"]
+ "PEP8/ValidEncodings", MiscellaneousCheckerDefaultArgs["CodingChecker"]
)
Preferences.getSettings().setValue(
"PEP8/CopyrightMinFileSize",
- MiscellaneousCheckerDefaultArgs["CopyrightChecker"]["MinFilesize"]
+ MiscellaneousCheckerDefaultArgs["CopyrightChecker"]["MinFilesize"],
)
Preferences.getSettings().setValue(
"PEP8/CopyrightAuthor",
- MiscellaneousCheckerDefaultArgs["CopyrightChecker"]["Author"]
+ MiscellaneousCheckerDefaultArgs["CopyrightChecker"]["Author"],
)
Preferences.getSettings().setValue("PEP8/FutureChecker", "")
Preferences.getSettings().setValue(
- "PEP8/BuiltinsChecker",
- MiscellaneousCheckerDefaultArgs["BuiltinsChecker"]
+ "PEP8/BuiltinsChecker", MiscellaneousCheckerDefaultArgs["BuiltinsChecker"]
)
Preferences.getSettings().setValue(
"PEP8/AggressiveSearch",
- MiscellaneousCheckerDefaultArgs[
- "CommentedCodeChecker"]["Aggressive"]
+ MiscellaneousCheckerDefaultArgs["CommentedCodeChecker"]["Aggressive"],
)
Preferences.getSettings().setValue(
"PEP8/CommentedCodeWhitelist",
- MiscellaneousCheckerDefaultArgs[
- "CommentedCodeChecker"]["WhiteList"]
+ MiscellaneousCheckerDefaultArgs["CommentedCodeChecker"]["WhiteList"],
)
-
+
# Type Annotations Checker
Preferences.getSettings().setValue(
"PEP8/MinimumAnnotationsCoverage",
- AnnotationsCheckerDefaultArgs["MinimumCoverage"])
+ AnnotationsCheckerDefaultArgs["MinimumCoverage"],
+ )
Preferences.getSettings().setValue(
"PEP8/MaximumAnnotationComplexity",
- AnnotationsCheckerDefaultArgs["MaximumComplexity"])
+ AnnotationsCheckerDefaultArgs["MaximumComplexity"],
+ )
Preferences.getSettings().setValue(
"PEP8/MaximumAnnotationLength",
- AnnotationsCheckerDefaultArgs["MaximumLength"])
+ AnnotationsCheckerDefaultArgs["MaximumLength"],
+ )
Preferences.getSettings().setValue(
"PEP8/SuppressNoneReturning",
- AnnotationsCheckerDefaultArgs["SuppressNoneReturning"])
+ AnnotationsCheckerDefaultArgs["SuppressNoneReturning"],
+ )
Preferences.getSettings().setValue(
- "PEP8/SuppressDummyArgs",
- AnnotationsCheckerDefaultArgs["SuppressDummyArgs"])
+ "PEP8/SuppressDummyArgs", AnnotationsCheckerDefaultArgs["SuppressDummyArgs"]
+ )
Preferences.getSettings().setValue(
- "PEP8/AllowUntypedDefs",
- AnnotationsCheckerDefaultArgs["AllowUntypedDefs"])
+ "PEP8/AllowUntypedDefs", AnnotationsCheckerDefaultArgs["AllowUntypedDefs"]
+ )
Preferences.getSettings().setValue(
"PEP8/AllowUntypedNested",
- AnnotationsCheckerDefaultArgs["AllowUntypedNested"])
+ AnnotationsCheckerDefaultArgs["AllowUntypedNested"],
+ )
Preferences.getSettings().setValue(
- "PEP8/MypyInitReturn",
- AnnotationsCheckerDefaultArgs["MypyInitReturn"])
+ "PEP8/MypyInitReturn", AnnotationsCheckerDefaultArgs["MypyInitReturn"]
+ )
Preferences.getSettings().setValue(
"PEP8/DispatchDecorators",
- AnnotationsCheckerDefaultArgs["DispatchDecorators"])
+ AnnotationsCheckerDefaultArgs["DispatchDecorators"],
+ )
Preferences.getSettings().setValue(
"PEP8/OverloadDecorators",
- AnnotationsCheckerDefaultArgs["OverloadDecorators"])
-
+ AnnotationsCheckerDefaultArgs["OverloadDecorators"],
+ )
+
# Security Checker
from .Security.SecurityDefaults import SecurityDefaults
+
Preferences.getSettings().setValue(
"PEP8/HardcodedTmpDirectories",
- SecurityDefaults["hardcoded_tmp_directories"])
+ SecurityDefaults["hardcoded_tmp_directories"],
+ )
Preferences.getSettings().setValue(
- "PEP8/InsecureHashes",
- SecurityDefaults["insecure_hashes"])
+ "PEP8/InsecureHashes", SecurityDefaults["insecure_hashes"]
+ )
Preferences.getSettings().setValue(
"PEP8/InsecureSslProtocolVersions",
- SecurityDefaults["insecure_ssl_protocol_versions"])
+ SecurityDefaults["insecure_ssl_protocol_versions"],
+ )
Preferences.getSettings().setValue(
- "PEP8/WeakKeySizeDsaHigh",
- str(SecurityDefaults["weak_key_size_dsa_high"]))
+ "PEP8/WeakKeySizeDsaHigh", str(SecurityDefaults["weak_key_size_dsa_high"])
+ )
Preferences.getSettings().setValue(
"PEP8/WeakKeySizeDsaMedium",
- str(SecurityDefaults["weak_key_size_dsa_medium"]))
+ str(SecurityDefaults["weak_key_size_dsa_medium"]),
+ )
Preferences.getSettings().setValue(
- "PEP8/WeakKeySizeRsaHigh",
- str(SecurityDefaults["weak_key_size_rsa_high"]))
+ "PEP8/WeakKeySizeRsaHigh", str(SecurityDefaults["weak_key_size_rsa_high"])
+ )
Preferences.getSettings().setValue(
"PEP8/WeakKeySizeRsaMedium",
- str(SecurityDefaults["weak_key_size_rsa_medium"]))
+ str(SecurityDefaults["weak_key_size_rsa_medium"]),
+ )
Preferences.getSettings().setValue(
- "PEP8/WeakKeySizeEcHigh",
- str(SecurityDefaults["weak_key_size_ec_high"]))
+ "PEP8/WeakKeySizeEcHigh", str(SecurityDefaults["weak_key_size_ec_high"])
+ )
Preferences.getSettings().setValue(
- "PEP8/WeakKeySizeEcMedium",
- str(SecurityDefaults["weak_key_size_ec_medium"]))
+ "PEP8/WeakKeySizeEcMedium", str(SecurityDefaults["weak_key_size_ec_medium"])
+ )
Preferences.getSettings().setValue(
- "PEP8/CheckTypedException",
- SecurityDefaults["check_typed_exception"])
-
+ "PEP8/CheckTypedException", SecurityDefaults["check_typed_exception"]
+ )
+
# Imports Checker
- Preferences.getSettings().setValue(
- "PEP8/ApplicationPackageNames", [])
- Preferences.getSettings().setValue(
- "PEP8/BannedModules", [])
- Preferences.getSettings().setValue(
- "PEP8/BanRelativeImports", "")
-
+ Preferences.getSettings().setValue("PEP8/ApplicationPackageNames", [])
+ Preferences.getSettings().setValue("PEP8/BannedModules", [])
+ Preferences.getSettings().setValue("PEP8/BanRelativeImports", "")
+
# Update UI with default values
self.on_loadDefaultButton_clicked()
-
+
@pyqtSlot()
def on_cancelButton_clicked(self):
"""
@@ -1936,25 +2078,23 @@
QTimer.singleShot(1000, self.__finish)
else:
self.__finish()
-
+
@pyqtSlot(QAbstractButton)
def on_buttonBox_clicked(self, button):
"""
Private slot called by a button of the button box clicked.
-
+
@param button button that was clicked
@type QAbstractButton
"""
- if button == self.buttonBox.button(
- QDialogButtonBox.StandardButton.Close
- ):
+ if button == self.buttonBox.button(QDialogButtonBox.StandardButton.Close):
self.close()
-
+
def __clearErrors(self, files):
"""
Private method to clear all warning markers of open editors to be
checked.
-
+
@param files list of files to be checked
@type list of str
"""
@@ -1963,12 +2103,12 @@
for file in [f for f in openFiles if f in files]:
editor = vm.getOpenEditor(file)
editor.clearStyleWarnings()
-
+
@pyqtSlot()
def on_fixButton_clicked(self):
"""
Private slot to fix selected issues.
-
+
Build a dictionary of issues to fix. Update the initialized __options.
Then call check with the dict as keyparam to fix selected issues.
"""
@@ -1979,25 +2119,27 @@
filename = itm.data(0, self.filenameRole)
if filename not in fixesDict:
fixesDict[filename] = []
- fixesDict[filename].append((
- {
- "file": filename,
- "line": itm.data(0, self.lineRole),
- "offset": itm.data(0, self.positionRole),
- "code": itm.data(0, self.codeRole),
- "display": itm.data(0, self.messageRole),
- "args": itm.data(0, self.argsRole),
- },
- itm
- ))
-
+ fixesDict[filename].append(
+ (
+ {
+ "file": filename,
+ "line": itm.data(0, self.lineRole),
+ "offset": itm.data(0, self.positionRole),
+ "code": itm.data(0, self.codeRole),
+ "display": itm.data(0, self.messageRole),
+ "args": itm.data(0, self.argsRole),
+ },
+ itm,
+ )
+ )
+
# update the configuration values (3: fixCodes, 4: noFixCodes,
# 5: fixIssues, 6: maxLineLength)
self.__options[3] = self.fixIssuesEdit.text()
self.__options[4] = self.noFixIssuesEdit.text()
self.__options[5] = True
self.__options[6] = self.lineLengthSpinBox.value()
-
+
self.files = list(fixesDict.keys())
# now go through all the files
self.progress = 0
@@ -2005,11 +2147,11 @@
self.cancelled = False
self.__onlyFixes = fixesDict
self.check()
-
+
def __getSelectedFixableItems(self):
"""
Private method to extract all selected items for fixable issues.
-
+
@return selected items for fixable issues
@rtype list of QTreeWidgetItem
"""
@@ -2022,32 +2164,31 @@
fixableItems.append(citm)
elif self.__itemFixable(itm) and itm not in fixableItems:
fixableItems.append(itm)
-
+
return fixableItems
-
+
def __itemFixable(self, itm):
"""
Private method to check, if an item has a fixable issue.
-
+
@param itm item to be checked
@type QTreeWidgetItem
@return flag indicating a fixable issue
@rtype bool
"""
- return (itm.data(0, self.fixableRole) and
- not itm.data(0, self.ignoredRole))
-
+ return itm.data(0, self.fixableRole) and not itm.data(0, self.ignoredRole)
+
def __initFuturesList(self, selectedFutures):
"""
Private method to set the selected status of the future imports.
-
+
@param selectedFutures comma separated list of expected future imports
@type str
"""
expectedImports = (
[i.strip() for i in selectedFutures.split(",") if bool(i.strip())]
- if selectedFutures else
- []
+ if selectedFutures
+ else []
)
for row in range(self.futuresList.count()):
itm = self.futuresList.item(row)
@@ -2055,11 +2196,11 @@
itm.setCheckState(Qt.CheckState.Checked)
else:
itm.setCheckState(Qt.CheckState.Unchecked)
-
+
def __getSelectedFutureImports(self):
"""
Private method to get the expected future imports.
-
+
@return expected future imports as a comma separated string
@rtype str
"""
@@ -2069,11 +2210,11 @@
if itm.checkState() == Qt.CheckState.Checked:
selectedFutures.append(itm.text())
return ", ".join(selectedFutures)
-
+
def __initBuiltinsIgnoreList(self, builtinsIgnoreDict):
"""
Private method to populate the list of shadowed builtins to be ignored.
-
+
@param builtinsIgnoreDict dictionary containing the builtins
assignments to be ignored
@type dict of list of str
@@ -2082,14 +2223,14 @@
for left, rightList in builtinsIgnoreDict.items():
for right in rightList:
QTreeWidgetItem(self.builtinsAssignmentList, [left, right])
-
+
self.on_builtinsAssignmentList_itemSelectionChanged()
-
+
def __getBuiltinsIgnoreList(self):
"""
Private method to get a dictionary containing the builtins assignments
to be ignored.
-
+
@return dictionary containing the builtins assignments to be ignored
@rtype dict of list of str
"""
@@ -2100,30 +2241,30 @@
if left not in builtinsIgnoreDict:
builtinsIgnoreDict[left] = []
builtinsIgnoreDict[left].append(right)
-
+
return builtinsIgnoreDict
-
+
@pyqtSlot()
def on_builtinsAssignmentList_itemSelectionChanged(self):
"""
Private slot to react upon changes of the selected builtin assignments.
"""
self.deleteBuiltinButton.setEnabled(
- len(self.builtinsAssignmentList.selectedItems()) > 0)
-
+ len(self.builtinsAssignmentList.selectedItems()) > 0
+ )
+
@pyqtSlot()
def on_addBuiltinButton_clicked(self):
"""
Private slot to add a built-in assignment to be ignored.
"""
- from .CodeStyleAddBuiltinIgnoreDialog import (
- CodeStyleAddBuiltinIgnoreDialog
- )
+ from .CodeStyleAddBuiltinIgnoreDialog import CodeStyleAddBuiltinIgnoreDialog
+
dlg = CodeStyleAddBuiltinIgnoreDialog(self)
if dlg.exec() == QDialog.DialogCode.Accepted:
left, right = dlg.getData()
QTreeWidgetItem(self.builtinsAssignmentList, [left, right])
-
+
@pyqtSlot()
def on_deleteBuiltinButton_clicked(self):
"""
@@ -2133,20 +2274,19 @@
index = self.builtinsAssignmentList.indexOfTopLevelItem(itm)
self.builtinsAssignmentList.takeTopLevelItem(index)
del itm
-
+
def __initCategoriesList(self, enabledCategories):
"""
Private method to set the enabled status of the checker categories.
-
+
@param enabledCategories comma separated list of enabled checker
categories
@type str
"""
enabledCategoriesList = (
- [c.strip() for c in enabledCategories.split(",")
- if bool(c.strip())]
- if enabledCategories else
- list(CodeStyleCheckerDialog.checkCategories.keys())
+ [c.strip() for c in enabledCategories.split(",") if bool(c.strip())]
+ if enabledCategories
+ else list(CodeStyleCheckerDialog.checkCategories.keys())
)
for row in range(self.categoriesList.count()):
itm = self.categoriesList.item(row)
@@ -2154,11 +2294,11 @@
itm.setCheckState(Qt.CheckState.Checked)
else:
itm.setCheckState(Qt.CheckState.Unchecked)
-
+
def __getCategories(self, enabled, asList=False):
"""
Private method to get the enabled or disabled checker categories.
-
+
@param enabled flag indicating to return enabled categories
@type bool
@param asList flag indicating to return the checker categories as a
@@ -2168,7 +2308,7 @@
@rtype str or list of str
"""
state = Qt.CheckState.Checked if enabled else Qt.CheckState.Unchecked
-
+
checkerList = []
for row in range(self.categoriesList.count()):
itm = self.categoriesList.item(row)
@@ -2178,17 +2318,17 @@
return checkerList
else:
return ", ".join(checkerList)
-
+
def __assembleExcludeMessages(self):
"""
Private method to assemble the list of excluded checks.
-
+
@return list of excluded checks as a comma separated string.
@rtype str
"""
excludeMessages = self.excludeMessagesEdit.text()
disabledCategories = self.__getCategories(False)
-
+
if excludeMessages and disabledCategories:
return disabledCategories + "," + excludeMessages
elif disabledCategories:
@@ -2197,7 +2337,7 @@
return excludeMessages
else:
return ""
-
+
def __cleanupData(self):
"""
Private method to clean the loaded/entered data of redundant entries.
@@ -2205,65 +2345,62 @@
# Migrate single letter exclude messages to disabled checker categories
# and delete them from exlude messages
excludedMessages = [
- m.strip()
- for m in self.excludeMessagesEdit.text().split(",")
- if bool(m)
+ m.strip() for m in self.excludeMessagesEdit.text().split(",") if bool(m)
]
- excludedMessageCategories = [
- c for c in excludedMessages if len(c) == 1
- ]
+ excludedMessageCategories = [c for c in excludedMessages if len(c) == 1]
enabledCheckers = self.__getCategories(True, asList=True)
for category in excludedMessageCategories:
if category in enabledCheckers:
enabledCheckers.remove(category)
excludedMessages.remove(category)
-
+
# Remove excluded messages of an already excluded category
disabledCheckers = self.__getCategories(False, asList=True)
for message in excludedMessages[:]:
if message[0] in disabledCheckers:
excludedMessages.remove(message)
-
+
self.excludeMessagesEdit.setText(",".join(excludedMessages))
self.__initCategoriesList(",".join(enabledCheckers))
-
+
def __initCommentedCodeCheckerWhiteList(self, whitelist):
"""
Private method to populate the list of commented code whitelist
patterns.
-
+
@param whitelist list of commented code whitelist patterns
@type list of str
"""
self.whitelistWidget.clear()
-
+
for pattern in whitelist:
QListWidgetItem(pattern, self.whitelistWidget)
-
+
self.on_whitelistWidget_itemSelectionChanged()
-
+
def __getCommentedCodeCheckerWhiteList(self):
"""
Private method to get the list of commented code whitelist patterns.
-
+
@return list of commented code whitelist patterns
@rtype list of str
"""
whitelist = []
-
+
for row in range(self.whitelistWidget.count()):
whitelist.append(self.whitelistWidget.item(row).text())
-
+
return whitelist
-
+
@pyqtSlot()
def on_whitelistWidget_itemSelectionChanged(self):
"""
Private slot to react upon changes of the selected whitelist patterns.
"""
self.deleteWhitelistButton.setEnabled(
- len(self.whitelistWidget.selectedItems()) > 0)
-
+ len(self.whitelistWidget.selectedItems()) > 0
+ )
+
@pyqtSlot()
def on_addWhitelistButton_clicked(self):
"""
@@ -2273,10 +2410,11 @@
self,
self.tr("Commented Code Whitelist Pattern"),
self.tr("Enter a Commented Code Whitelist Pattern"),
- QLineEdit.EchoMode.Normal)
+ QLineEdit.EchoMode.Normal,
+ )
if ok and pattern:
QListWidgetItem(pattern, self.whitelistWidget)
-
+
@pyqtSlot()
def on_deleteWhitelistButton_clicked(self):
"""
@@ -2286,7 +2424,7 @@
row = self.whitelistWidget.row(itm)
self.whitelistWidget.takeItem(row)
del itm
-
+
@pyqtSlot()
def on_filterButton_clicked(self):
"""
@@ -2294,7 +2432,7 @@
code.
"""
selectedMessageCode = self.filterComboBox.currentText()
-
+
for topRow in range(self.resultList.topLevelItemCount()):
topItem = self.resultList.topLevelItem(topRow)
topItem.setExpanded(True)
@@ -2303,8 +2441,8 @@
childItem = topItem.child(childIndex)
hideChild = (
childItem.data(0, self.codeRole) != selectedMessageCode
- if selectedMessageCode else
- False
+ if selectedMessageCode
+ else False
)
childItem.setHidden(hideChild)
if hideChild:
