diff -r 54b73174ab61 -r 2c3f14a3c595 eric6/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py
--- a/eric6/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py Thu Jan 14 17:51:12 2021 +0100
+++ b/eric6/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py Thu Jan 14 17:58:40 2021 +0100
@@ -9,6 +9,7 @@
import os
import fnmatch
+import copy
from PyQt5.QtCore import pyqtSlot, Qt, QTimer, QCoreApplication
from PyQt5.QtGui import QIcon
@@ -27,6 +28,10 @@
from . import pycodestyle
+from .Miscellaneous.MiscellaneousDefaults import (
+ MiscellaneousCheckerDefaultArgs
+)
+
try:
basestring # __IGNORE_WARNING__
except Exception:
@@ -155,6 +160,8 @@
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)
@@ -449,42 +456,36 @@
if "LineComplexityScore" not in self.__data:
self.__data["LineComplexityScore"] = 10
if "ValidEncodings" not in self.__data:
- self.__data["ValidEncodings"] = "latin-1, utf-8"
+ self.__data["ValidEncodings"] = (
+ MiscellaneousCheckerDefaultArgs["CodingChecker"]
+ )
if (
"CopyrightMinFileSize" not in self.__data or
"CopyrightAuthor" not in self.__data
):
- self.__data["CopyrightMinFileSize"] = 0
- self.__data["CopyrightAuthor"] = ""
+ 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"] = {
- "str": ["unicode", ],
- "chr": ["unichr", ],
- }
+ self.__data["BuiltinsChecker"] = copy.deepcopy(
+ MiscellaneousCheckerDefaultArgs["BuiltinsChecker"]
+ )
if "CommentedCodeChecker" not in self.__data:
- self.__data["CommentedCodeChecker"] = {
- "Aggressive": False,
- }
+ self.__data["CommentedCodeChecker"] = copy.deepcopy(
+ MiscellaneousCheckerDefaultArgs["CommentedCodeChecker"]
+ )
if "WhiteList" not in self.__data["CommentedCodeChecker"]:
- self.__data["CommentedCodeChecker"]["WhiteList"] = [
- r'pylint',
- r'pyright',
- r'noqa',
- r'type:\s*ignore',
- r'fmt:\s*(on|off)',
- r'TODO',
- r'FIXME',
- r'WARNING',
- r'NOTE',
- r'TEST',
- r'DOCU',
- r'XXX',
- r'~ ',
- r'- ',
- ]
+ self.__data["CommentedCodeChecker"]["WhiteList"] = (
+ MiscellaneousCheckerDefaultArgs[
+ "CommentedCodeChecker"]["WhiteList"][:]
+ )
if "AnnotationsChecker" not in self.__data:
self.__data["AnnotationsChecker"] = {
@@ -1354,20 +1355,43 @@
int(Preferences.Prefs.settings.value(
"PEP8/LineComplexityScore", 10)))
self.encodingsEdit.setText(Preferences.Prefs.settings.value(
- "PEP8/ValidEncodings", "latin-1, utf-8"))
+ "PEP8/ValidEncodings",
+ MiscellaneousCheckerDefaultArgs["CodingChecker"]
+ ))
self.copyrightFileSizeSpinBox.setValue(int(
- Preferences.Prefs.settings.value("PEP8/CopyrightMinFileSize", 0)))
+ Preferences.Prefs.settings.value(
+ "PEP8/CopyrightMinFileSize",
+ MiscellaneousCheckerDefaultArgs[
+ "CopyrightChecker"]["MinFilesize"]
+ )
+ ))
self.copyrightAuthorEdit.setText(
- Preferences.Prefs.settings.value("PEP8/CopyrightAuthor", ""))
+ Preferences.Prefs.settings.value(
+ "PEP8/CopyrightAuthor",
+ MiscellaneousCheckerDefaultArgs["CopyrightChecker"]["Author"]
+ )
+ )
self.__initFuturesList(
Preferences.Prefs.settings.value("PEP8/FutureChecker", ""))
self.__initBuiltinsIgnoreList(Preferences.toDict(
- Preferences.Prefs.settings.value("PEP8/BuiltinsChecker", {
- "str": ["unicode", ],
- "chr": ["unichr", ],
- })))
+ Preferences.Prefs.settings.value(
+ "PEP8/BuiltinsChecker",
+ MiscellaneousCheckerDefaultArgs["BuiltinsChecker"]
+ ))
+ )
self.aggressiveCheckBox.setChecked(Preferences.toBool(
- Preferences.Prefs.settings.value("PEP8/AggressiveSearch", False)))
+ Preferences.Prefs.settings.value(
+ "PEP8/AggressiveSearch",
+ MiscellaneousCheckerDefaultArgs[
+ "CommentedCodeChecker"]["Aggressive"]
+ )))
+ self.__initCommentedCodeCheckerWhiteList(Preferences.toList(
+ Preferences.Prefs.settings.value(
+ "PEP8/CommentedCodeWhitelist",
+ MiscellaneousCheckerDefaultArgs[
+ "CommentedCodeChecker"]["WhiteList"]
+ )
+ ))
self.minAnnotationsCoverageSpinBox.setValue(int(
Preferences.Prefs.settings.value(
"PEP8/MinimumAnnotationsCoverage", 75)))
@@ -1479,6 +1503,9 @@
Preferences.Prefs.settings.setValue(
"PEP8/AggressiveSearch", self.aggressiveCheckBox.isChecked())
Preferences.Prefs.settings.setValue(
+ "PEP8/CommentedCodeWhitelist",
+ self.__getCommentedCodeCheckerWhiteList())
+ Preferences.Prefs.settings.setValue(
"PEP8/MinimumAnnotationsCoverage",
self.minAnnotationsCoverageSpinBox.value())
Preferences.Prefs.settings.setValue(
@@ -1555,15 +1582,32 @@
Preferences.Prefs.settings.setValue("PEP8/LineComplexity", 15)
Preferences.Prefs.settings.setValue("PEP8/LineComplexityScore", 10)
Preferences.Prefs.settings.setValue(
- "PEP8/ValidEncodings", "latin-1, utf-8")
- Preferences.Prefs.settings.setValue("PEP8/CopyrightMinFileSize", 0)
- Preferences.Prefs.settings.setValue("PEP8/CopyrightAuthor", "")
+ "PEP8/ValidEncodings",
+ MiscellaneousCheckerDefaultArgs["CodingChecker"]
+ )
+ Preferences.Prefs.settings.setValue(
+ "PEP8/CopyrightMinFileSize",
+ MiscellaneousCheckerDefaultArgs["CopyrightChecker"]["MinFilesize"]
+ )
+ Preferences.Prefs.settings.setValue(
+ "PEP8/CopyrightAuthor",
+ MiscellaneousCheckerDefaultArgs["CopyrightChecker"]["Author"]
+ )
Preferences.Prefs.settings.setValue("PEP8/FutureChecker", "")
- Preferences.Prefs.settings.setValue("PEP8/BuiltinsChecker", {
- "str": ["unicode", ],
- "chr": ["unichr", ],
- })
- Preferences.Prefs.settings.setValue("PEP8/AggressiveSearch", False)
+ Preferences.Prefs.settings.setValue(
+ "PEP8/BuiltinsChecker",
+ MiscellaneousCheckerDefaultArgs["BuiltinsChecker"]
+ )
+ Preferences.Prefs.settings.setValue(
+ "PEP8/AggressiveSearch",
+ MiscellaneousCheckerDefaultArgs[
+ "CommentedCodeChecker"]["Aggressive"]
+ )
+ Preferences.Prefs.settings.setValue(
+ "PEP8/CommentedCodeWhitelist",
+ MiscellaneousCheckerDefaultArgs[
+ "CommentedCodeChecker"]["WhiteList"]
+ )
Preferences.Prefs.settings.setValue(
"PEP8/MinimumAnnotationsCoverage", 75)
Preferences.Prefs.settings.setValue(
@@ -1962,6 +2006,6 @@
Private slot to delete the selected items from the list.
"""
for itm in self.whitelistWidget.selectedItems():
- index = self.whitelistWidget.indexOfTopLevelItem(itm)
- self.whitelistWidget.takeTopLevelItem(index)
+ row = self.whitelistWidget.row(itm)
+ self.whitelistWidget.takeItem(row)
del itm
