diff -r c114e9476034 -r 2f6df822e3b9 src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py --- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py Sun Jun 30 15:37:49 2024 +0200 +++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py Sun Jun 30 17:58:31 2024 +0200 @@ -27,7 +27,7 @@ QTreeWidgetItem, ) -from eric7 import Preferences, Utilities +from eric7 import EricUtilities, Preferences, Utilities from eric7.EricGui import EricPixmapCache from eric7.EricWidgets.EricApplication import ericApp from eric7.QScintilla.Editor import EditorWarningKind @@ -1694,7 +1694,7 @@ settings.value("PEP8/IncludeMessages", defaultParameters["IncludeMessages"]) ) self.repeatCheckBox.setChecked( - Preferences.toBool( + EricUtilities.toBool( settings.value( "PEP8/RepeatMessages", defaultParameters["RepeatMessages"] ) @@ -1707,12 +1707,12 @@ settings.value("PEP8/NoFixCodes", defaultParameters["NoFixCodes"]) ) self.fixIssuesCheckBox.setChecked( - Preferences.toBool( + EricUtilities.toBool( settings.value("PEP8/FixIssues", defaultParameters["FixIssues"]) ) ) self.ignoredCheckBox.setChecked( - Preferences.toBool( + EricUtilities.toBool( settings.value("PEP8/ShowIgnored", defaultParameters["ShowIgnored"]) ) ) @@ -1743,7 +1743,7 @@ ) ) self.hangClosingCheckBox.setChecked( - Preferences.toBool( + EricUtilities.toBool( settings.value("PEP8/HangClosing", defaultParameters["HangClosing"]) ) ) @@ -1791,14 +1791,14 @@ settings.value("PEP8/FutureChecker", defaultParameters["FutureChecker"]) ) self.__initBuiltinsIgnoreList( - Preferences.toDict( + EricUtilities.toDict( settings.value( "PEP8/BuiltinsChecker", defaultParameters["BuiltinsChecker"] ) ) ) self.aggressiveCheckBox.setChecked( - Preferences.toBool( + EricUtilities.toBool( settings.value( "PEP8/AggressiveSearch", defaultParameters["CommentedCodeChecker"]["Aggressive"], @@ -1806,7 +1806,7 @@ ) ) self.__initCommentedCodeCheckerWhiteList( - Preferences.toList( + EricUtilities.toList( settings.value( "PEP8/CommentedCodeWhitelist", defaultParameters["CommentedCodeChecker"]["WhiteList"], @@ -1840,7 +1840,7 @@ ) ) self.suppressNoneReturningCheckBox.setChecked( - Preferences.toBool( + EricUtilities.toBool( settings.value( "PEP8/SuppressNoneReturning", defaultParameters["AnnotationsChecker"]["SuppressNoneReturning"], @@ -1848,7 +1848,7 @@ ) ) self.suppressDummyArgsCheckBox.setChecked( - Preferences.toBool( + EricUtilities.toBool( settings.value( "PEP8/SuppressDummyArgs", defaultParameters["AnnotationsChecker"]["SuppressDummyArgs"], @@ -1856,7 +1856,7 @@ ) ) self.allowUntypedDefsCheckBox.setChecked( - Preferences.toBool( + EricUtilities.toBool( settings.value( "PEP8/AllowUntypedDefs", defaultParameters["AnnotationsChecker"]["AllowUntypedDefs"], @@ -1864,7 +1864,7 @@ ) ) self.allowUntypedNestedCheckBox.setChecked( - Preferences.toBool( + EricUtilities.toBool( settings.value( "PEP8/AllowUntypedNested", defaultParameters["AnnotationsChecker"]["AllowUntypedNested"], @@ -1872,7 +1872,7 @@ ) ) self.mypyInitReturnCheckBox.setChecked( - Preferences.toBool( + EricUtilities.toBool( settings.value( "PEP8/MypyInitReturn", defaultParameters["AnnotationsChecker"]["MypyInitReturn"], @@ -1880,7 +1880,7 @@ ) ) self.allowStarArgAnyCheckBox.setChecked( - Preferences.toBool( + EricUtilities.toBool( settings.value( "PEP8/AllowStarArgAny", defaultParameters["AnnotationsChecker"]["AllowStarArgAny"], @@ -1888,7 +1888,7 @@ ) ) self.forceFutureAnnotationsCheckBox.setChecked( - Preferences.toBool( + EricUtilities.toBool( settings.value( "PEP8/ForceFutureAnnotations", defaultParameters["AnnotationsChecker"]["ForceFutureAnnotations"], @@ -1896,7 +1896,7 @@ ) ) self.simplifiedTypesCheckBox.setChecked( - Preferences.toBool( + EricUtilities.toBool( settings.value( "PEP8/CheckFutureAnnotations", defaultParameters["AnnotationsChecker"]["CheckFutureAnnotations"], @@ -1904,7 +1904,7 @@ ) ) self.typeIgnoreCheckBox.setChecked( - Preferences.toBool( + EricUtilities.toBool( settings.value( "PEP8/RespectTypeIgnore", defaultParameters["AnnotationsChecker"]["RespectTypeIgnore"], @@ -1913,7 +1913,7 @@ ) self.dispatchDecoratorEdit.setText( ", ".join( - Preferences.toList( + EricUtilities.toList( settings.value( "PEP8/DispatchDecorators", defaultParameters["AnnotationsChecker"]["DispatchDecorators"], @@ -1923,7 +1923,7 @@ ) self.overloadDecoratorEdit.setText( ", ".join( - Preferences.toList( + EricUtilities.toList( settings.value( "PEP8/OverloadDecorators", defaultParameters["AnnotationsChecker"]["OverloadDecorators"], @@ -1933,7 +1933,7 @@ ) self.exemptedTypingSymbolsEdit.setText( ", ".join( - Preferences.toList( + EricUtilities.toList( settings.value( "PEP8/ExemptedTypingSymbols", defaultParameters["AnnotationsChecker"][ @@ -1947,7 +1947,7 @@ # Security Checker self.tmpDirectoriesEdit.setPlainText( "\n".join( - Preferences.toList( + EricUtilities.toList( settings.value( "PEP8/HardcodedTmpDirectories", defaultParameters["SecurityChecker"]["HardcodedTmpDirectories"], @@ -1957,7 +1957,7 @@ ) self.hashesEdit.setText( ", ".join( - Preferences.toList( + EricUtilities.toList( settings.value( "PEP8/InsecureHashes", defaultParameters["SecurityChecker"]["InsecureHashes"], @@ -1967,7 +1967,7 @@ ) self.insecureSslProtocolsEdit.setPlainText( "\n".join( - Preferences.toList( + EricUtilities.toList( settings.value( "PEP8/InsecureSslProtocolVersions", defaultParameters["SecurityChecker"][ @@ -2014,7 +2014,7 @@ ) ) self.typedExceptionsCheckBox.setChecked( - Preferences.toBool( + EricUtilities.toBool( settings.value( "PEP8/CheckTypedException", defaultParameters["SecurityChecker"]["CheckTypedException"], @@ -2026,7 +2026,7 @@ self.appPackagesEdit.setPlainText( " ".join( sorted( - Preferences.toList( + EricUtilities.toList( settings.value( "PEP8/ApplicationPackageNames", defaultParameters["ImportsChecker"][ @@ -2040,7 +2040,7 @@ self.bannedModulesEdit.setPlainText( " ".join( sorted( - Preferences.toList( + EricUtilities.toList( settings.value( "PEP8/BannedModules", defaultParameters["ImportsChecker"]["BannedModules"], @@ -2065,7 +2065,7 @@ ) ) self.sortCaseSensitiveCheckBox.setChecked( - Preferences.toBool( + EricUtilities.toBool( settings.value( "PEP8/SortCaseSensitive", defaultParameters["NameOrderChecker"]["SortCaseSensitive"], @@ -2073,7 +2073,7 @@ ) ) self.combinedAsImpotsCheckBox.setChecked( - Preferences.toBool( + EricUtilities.toBool( settings.value( "PEP8/CombinedAsImports", defaultParameters["NameOrderChecker"]["CombinedAsImports"], @@ -2081,7 +2081,7 @@ ) ) self.sortIgnoreStyleCheckBox.setChecked( - Preferences.toBool( + EricUtilities.toBool( settings.value( "PEP8/SortIgnoringStyle", defaultParameters["NameOrderChecker"]["SortIgnoringStyle"], @@ -2089,7 +2089,7 @@ ) ) self.sortFromFirstCheckBox.setChecked( - Preferences.toBool( + EricUtilities.toBool( settings.value( "PEP8/SortFromFirst", defaultParameters["NameOrderChecker"]["SortFromFirst"], @@ -2099,7 +2099,7 @@ # Unused Checker self.ignoreAbstractCheckBox.setChecked( - Preferences.toBool( + EricUtilities.toBool( settings.value( "PEP8/UnusedIgnoreAbstract", defaultParameters["UnusedChecker"]["IgnoreAbstract"], @@ -2107,7 +2107,7 @@ ) ) self.ignoreOverloadCheckBox.setChecked( - Preferences.toBool( + EricUtilities.toBool( settings.value( "PEP8/UnusedIgnoreOverload", defaultParameters["UnusedChecker"]["IgnoreOverload"], @@ -2115,7 +2115,7 @@ ) ) self.ignoreOverrideCheckBox.setChecked( - Preferences.toBool( + EricUtilities.toBool( settings.value( "PEP8/UnusedIgnoreOverride", defaultParameters["UnusedChecker"]["IgnoreOverride"], @@ -2123,7 +2123,7 @@ ) ) self.ignoreStubsCheckBox.setChecked( - Preferences.toBool( + EricUtilities.toBool( settings.value( "PEP8/UnusedIgnoreStubs", defaultParameters["UnusedChecker"]["IgnoreStubs"], @@ -2131,7 +2131,7 @@ ) ) self.ignoreVariadicNamesCheckBox.setChecked( - Preferences.toBool( + EricUtilities.toBool( settings.value( "PEP8/UnusedIgnoreVariadicNames", defaultParameters["UnusedChecker"]["IgnoreVariadicNames"], @@ -2139,7 +2139,7 @@ ) ) self.ignoreLambdasCheckBox.setChecked( - Preferences.toBool( + EricUtilities.toBool( settings.value( "PEP8/UnusedIgnoreLambdas", defaultParameters["UnusedChecker"]["IgnoreLambdas"], @@ -2147,7 +2147,7 @@ ) ) self.ignoreNestedFunctionsCheckBox.setChecked( - Preferences.toBool( + EricUtilities.toBool( settings.value( "PEP8/UnusedIgnoreNestedFunctions", defaultParameters["UnusedChecker"]["IgnoreNestedFunctions"], @@ -2155,7 +2155,7 @@ ) ) self.ignoreDunderMethodsCheckBox.setChecked( - Preferences.toBool( + EricUtilities.toBool( settings.value( "PEP8/UnusedIgnoreDunderMethods", defaultParameters["UnusedChecker"]["IgnoreDunderMethods"], @@ -2163,7 +2163,7 @@ ) ) self.ignoreSlotsCheckBox.setChecked( - Preferences.toBool( + EricUtilities.toBool( settings.value( "PEP8/UnusedIgnoreSlotMethods", defaultParameters["UnusedChecker"]["IgnoreSlotMethods"], @@ -2171,7 +2171,7 @@ ) ) self.ignoreEventHandlersCheckBox.setChecked( - Preferences.toBool( + EricUtilities.toBool( settings.value( "PEP8/UnusedIgnoreEventHandlerMethods", defaultParameters["UnusedChecker"]["IgnoreEventHandlerMethods"], @@ -2179,7 +2179,7 @@ ) ) self.ignoreDunderGlobalsCheckBox.setChecked( - Preferences.toBool( + EricUtilities.toBool( settings.value( "PRP8/UnusedIgnoreDunderGlobals", defaultParameters["UnusedChecker"]["IgnoreDunderGlobals"],