Mercurial Repositories > eric / file comparison
comparison: src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py
src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py
- branch
- eric7
- changeset 10046
- 35b27af462ef
- parent 10043
- f1427d95cfde
- child 10050
- 3750abc45d5e
equal
deleted
inserted
replaced
| 10045:f5c57f8d17a4 | 10046:35b27af462ef |
|---|---|
| 86 "D": QCoreApplication.translate("CheckerCategories", "Documentation"), | 86 "D": QCoreApplication.translate("CheckerCategories", "Documentation"), |
| 87 "E": QCoreApplication.translate("CheckerCategories", "Errors"), | 87 "E": QCoreApplication.translate("CheckerCategories", "Errors"), |
| 88 "I": QCoreApplication.translate("CheckerCategories", "Imports"), | 88 "I": QCoreApplication.translate("CheckerCategories", "Imports"), |
| 89 "M": QCoreApplication.translate("CheckerCategories", "Miscellaneous"), | 89 "M": QCoreApplication.translate("CheckerCategories", "Miscellaneous"), |
| 90 "N": QCoreApplication.translate("CheckerCategories", "Naming"), | 90 "N": QCoreApplication.translate("CheckerCategories", "Naming"), |
| 91 "NO": QCoreApplication.translate("CheckerCategories", "Name Order"), | |
| 91 "P": QCoreApplication.translate("CheckerCategories", "'pathlib' Usage"), | 92 "P": QCoreApplication.translate("CheckerCategories", "'pathlib' Usage"), |
| 92 "S": QCoreApplication.translate("CheckerCategories", "Security"), | 93 "S": QCoreApplication.translate("CheckerCategories", "Security"), |
| 93 "W": QCoreApplication.translate("CheckerCategories", "Warnings"), | 94 "W": QCoreApplication.translate("CheckerCategories", "Warnings"), |
| 94 "Y": QCoreApplication.translate("CheckerCategories", "Simplify Code"), | 95 "Y": QCoreApplication.translate("CheckerCategories", "Simplify Code"), |
| 95 } | 96 } |
| 490 # Imports | 491 # Imports |
| 491 "ImportsChecker": { | 492 "ImportsChecker": { |
| 492 "ApplicationPackageNames": [], | 493 "ApplicationPackageNames": [], |
| 493 "BannedModules": [], | 494 "BannedModules": [], |
| 494 "BanRelativeImports": "", | 495 "BanRelativeImports": "", |
| 496 }, | |
| 497 # Name Order | |
| 498 "NameOrderChecker": { | |
| 499 "ApplicationPackageNames": [], | |
| 495 "SortOrder": "natural", | 500 "SortOrder": "natural", |
| 496 "SortCaseSensitive": False, | 501 "SortCaseSensitive": False, |
| 497 "CombinedAsImports": False, | 502 "CombinedAsImports": False, |
| 498 "SortIgnoringStyle": False, | 503 "SortIgnoringStyle": False, |
| 499 "SortFromFirst": False, | 504 "SortFromFirst": False, |
| 577 ]["ForceFutureAnnotations"], | 582 ]["ForceFutureAnnotations"], |
| 578 } | 583 } |
| 579 ) | 584 ) |
| 580 if "CheckFutureAnnotations" not in self.__data["AnnotationsChecker"]: | 585 if "CheckFutureAnnotations" not in self.__data["AnnotationsChecker"]: |
| 581 # third extension | 586 # third extension |
| 582 self.__data["AnnotationsChecker"]["CheckFutureAnnotations"] = ( | 587 self.__data["AnnotationsChecker"][ |
| 583 defaultParameters["AnnotationsChecker"]["CheckFutureAnnotations"] | 588 "CheckFutureAnnotations" |
| 584 ) | 589 ] = defaultParameters["AnnotationsChecker"]["CheckFutureAnnotations"] |
| 585 | |
| 586 # Upgrading ImportsChecker from older data structures | |
| 587 if "CombinedAsImports" not in self.__data["ImportsChecker"]: | |
| 588 self.__data["ImportsChecker"].update( | |
| 589 { | |
| 590 "SortOrder": defaultParameters["ImportsChecker"]["SortOrder"], | |
| 591 "SortCaseSensitive": defaultParameters["ImportsChecker"][ | |
| 592 "SortCaseSensitive" | |
| 593 ], | |
| 594 "CombinedAsImports": defaultParameters["ImportsChecker"][ | |
| 595 "CombinedAsImports" | |
| 596 ], | |
| 597 "SortIgnoringStyle": defaultParameters["ImportsChecker"][ | |
| 598 "SortIgnoringStyle" | |
| 599 ], | |
| 600 "SortFromFirst": defaultParameters["ImportsChecker"][ | |
| 601 "SortFromFirst" | |
| 602 ], | |
| 603 } | |
| 604 ) | |
| 605 | 590 |
| 606 self.__initCategoriesList(self.__data["EnabledCheckerCategories"]) | 591 self.__initCategoriesList(self.__data["EnabledCheckerCategories"]) |
| 607 self.excludeFilesEdit.setText(self.__data["ExcludeFiles"]) | 592 self.excludeFilesEdit.setText(self.__data["ExcludeFiles"]) |
| 608 self.excludeMessagesEdit.setText(self.__data["ExcludeMessages"]) | 593 self.excludeMessagesEdit.setText(self.__data["ExcludeMessages"]) |
| 609 self.includeMessagesEdit.setText(self.__data["IncludeMessages"]) | 594 self.includeMessagesEdit.setText(self.__data["IncludeMessages"]) |
| 716 " ".join(sorted(self.__data["ImportsChecker"]["BannedModules"])) | 701 " ".join(sorted(self.__data["ImportsChecker"]["BannedModules"])) |
| 717 ) | 702 ) |
| 718 self.__setBanRelativeImports( | 703 self.__setBanRelativeImports( |
| 719 self.__data["ImportsChecker"]["BanRelativeImports"] | 704 self.__data["ImportsChecker"]["BanRelativeImports"] |
| 720 ) | 705 ) |
| 706 | |
| 707 # NameOrderChecker | |
| 721 self.sortOrderComboBox.setCurrentIndex( | 708 self.sortOrderComboBox.setCurrentIndex( |
| 722 self.sortOrderComboBox.findData(self.__data["ImportsChecker"]["SortOrder"]) | 709 self.sortOrderComboBox.findData( |
| 710 self.__data["NameOrderChecker"]["SortOrder"] | |
| 711 ) | |
| 723 ) | 712 ) |
| 724 self.sortCaseSensitiveCheckBox.setChecked( | 713 self.sortCaseSensitiveCheckBox.setChecked( |
| 725 self.__data["ImportsChecker"]["SortCaseSensitive"] | 714 self.__data["NameOrderChecker"]["SortCaseSensitive"] |
| 726 ) | 715 ) |
| 727 self.combinedAsImpotsCheckBox.setChecked( | 716 self.combinedAsImpotsCheckBox.setChecked( |
| 728 self.__data["ImportsChecker"]["CombinedAsImports"] | 717 self.__data["NameOrderChecker"]["CombinedAsImports"] |
| 729 ) | 718 ) |
| 730 self.sortIgnoreStyleCheckBox.setChecked( | 719 self.sortIgnoreStyleCheckBox.setChecked( |
| 731 self.__data["ImportsChecker"]["SortIgnoringStyle"] | 720 self.__data["NameOrderChecker"]["SortIgnoringStyle"] |
| 732 ) | 721 ) |
| 733 self.sortFromFirstCheckBox.setChecked( | 722 self.sortFromFirstCheckBox.setChecked( |
| 734 self.__data["ImportsChecker"]["SortFromFirst"] | 723 self.__data["NameOrderChecker"]["SortFromFirst"] |
| 735 ) | 724 ) |
| 736 | 725 |
| 737 self.__cleanupData() | 726 self.__cleanupData() |
| 738 | 727 |
| 739 def __prepareProgress(self): | 728 def __prepareProgress(self): |
| 911 "ApplicationPackageNames": sorted( | 900 "ApplicationPackageNames": sorted( |
| 912 self.appPackagesEdit.toPlainText().split() | 901 self.appPackagesEdit.toPlainText().split() |
| 913 ), | 902 ), |
| 914 "BannedModules": sorted(self.bannedModulesEdit.toPlainText().split()), | 903 "BannedModules": sorted(self.bannedModulesEdit.toPlainText().split()), |
| 915 "BanRelativeImports": self.__getBanRelativeImportsValue(), | 904 "BanRelativeImports": self.__getBanRelativeImportsValue(), |
| 905 } | |
| 906 | |
| 907 nameOrderArgs = { | |
| 908 "ApplicationPackageNames": sorted( | |
| 909 self.appPackagesEdit.toPlainText().split() | |
| 910 ), | |
| 916 "SortOrder": self.sortOrderComboBox.currentData(), | 911 "SortOrder": self.sortOrderComboBox.currentData(), |
| 917 "SortCaseSensitive": self.sortCaseSensitiveCheckBox.isChecked(), | 912 "SortCaseSensitive": self.sortCaseSensitiveCheckBox.isChecked(), |
| 918 "CombinedAsImports": self.combinedAsImpotsCheckBox.isChecked(), | 913 "CombinedAsImports": self.combinedAsImpotsCheckBox.isChecked(), |
| 919 "SortIgnoringStyle": self.sortIgnoreStyleCheckBox.isChecked(), | 914 "SortIgnoringStyle": self.sortIgnoreStyleCheckBox.isChecked(), |
| 920 "SortFromFirst": self.sortFromFirstCheckBox.isChecked(), | 915 "SortFromFirst": self.sortFromFirstCheckBox.isChecked(), |
| 935 codeComplexityArgs, | 930 codeComplexityArgs, |
| 936 miscellaneousArgs, | 931 miscellaneousArgs, |
| 937 annotationArgs, | 932 annotationArgs, |
| 938 securityArgs, | 933 securityArgs, |
| 939 importsArgs, | 934 importsArgs, |
| 935 nameOrderArgs, | |
| 940 ] | 936 ] |
| 941 | 937 |
| 942 # now go through all the files | 938 # now go through all the files |
| 943 self.progress = 0 | 939 self.progress = 0 |
| 944 self.files.sort() | 940 self.files.sort() |
| 1356 ), | 1352 ), |
| 1357 "BannedModules": sorted( | 1353 "BannedModules": sorted( |
| 1358 self.bannedModulesEdit.toPlainText().split() | 1354 self.bannedModulesEdit.toPlainText().split() |
| 1359 ), | 1355 ), |
| 1360 "BanRelativeImports": self.__getBanRelativeImportsValue(), | 1356 "BanRelativeImports": self.__getBanRelativeImportsValue(), |
| 1357 }, | |
| 1358 "NameOrderChecker": { | |
| 1359 "ApplicationPackageNames": sorted( | |
| 1360 self.appPackagesEdit.toPlainText().split() | |
| 1361 ), | |
| 1361 "SortOrder": self.sortOrderComboBox.currentData(), | 1362 "SortOrder": self.sortOrderComboBox.currentData(), |
| 1362 "SortCaseSensitive": self.sortCaseSensitiveCheckBox.isChecked(), | 1363 "SortCaseSensitive": self.sortCaseSensitiveCheckBox.isChecked(), |
| 1363 "CombinedAsImports": self.combinedAsImpotsCheckBox.isChecked(), | 1364 "CombinedAsImports": self.combinedAsImpotsCheckBox.isChecked(), |
| 1364 "SortIgnoringStyle": self.sortIgnoreStyleCheckBox.isChecked(), | 1365 "SortIgnoringStyle": self.sortIgnoreStyleCheckBox.isChecked(), |
| 1365 "SortFromFirst": self.sortFromFirstCheckBox.isChecked(), | 1366 "SortFromFirst": self.sortFromFirstCheckBox.isChecked(), |
| 1899 settings.value( | 1900 settings.value( |
| 1900 "PEP8/BanRelativeImports", | 1901 "PEP8/BanRelativeImports", |
| 1901 defaultParameters["ImportsChecker"]["BanRelativeImports"], | 1902 defaultParameters["ImportsChecker"]["BanRelativeImports"], |
| 1902 ) | 1903 ) |
| 1903 ) | 1904 ) |
| 1905 | |
| 1906 # Name Order Checker | |
| 1904 self.sortOrderComboBox.setCurrentIndex( | 1907 self.sortOrderComboBox.setCurrentIndex( |
| 1905 self.sortOrderComboBox.findData( | 1908 self.sortOrderComboBox.findData( |
| 1906 settings.value( | 1909 settings.value( |
| 1907 "PEP8/SortOrder", defaultParameters["ImportsChecker"]["SortOrder"] | 1910 "PEP8/SortOrder", defaultParameters["NameOrderChecker"]["SortOrder"] |
| 1908 ) | 1911 ) |
| 1909 ) | 1912 ) |
| 1910 ) | 1913 ) |
| 1911 self.sortCaseSensitiveCheckBox.setChecked( | 1914 self.sortCaseSensitiveCheckBox.setChecked( |
| 1912 Preferences.toBool( | 1915 Preferences.toBool( |
| 1913 settings.value( | 1916 settings.value( |
| 1914 "PEP8/SortCaseSensitive", | 1917 "PEP8/SortCaseSensitive", |
| 1915 defaultParameters["ImportsChecker"]["SortCaseSensitive"], | 1918 defaultParameters["NameOrderChecker"]["SortCaseSensitive"], |
| 1916 ) | 1919 ) |
| 1917 ) | 1920 ) |
| 1918 ) | 1921 ) |
| 1919 self.combinedAsImpotsCheckBox.setChecked( | 1922 self.combinedAsImpotsCheckBox.setChecked( |
| 1920 Preferences.toBool( | 1923 Preferences.toBool( |
| 1921 settings.value( | 1924 settings.value( |
| 1922 "PEP8/CombinedAsImports", | 1925 "PEP8/CombinedAsImports", |
| 1923 defaultParameters["ImportsChecker"]["CombinedAsImports"], | 1926 defaultParameters["NameOrderChecker"]["CombinedAsImports"], |
| 1924 ) | 1927 ) |
| 1925 ) | 1928 ) |
| 1926 ) | 1929 ) |
| 1927 self.sortIgnoreStyleCheckBox.setChecked( | 1930 self.sortIgnoreStyleCheckBox.setChecked( |
| 1928 Preferences.toBool( | 1931 Preferences.toBool( |
| 1929 settings.value( | 1932 settings.value( |
| 1930 "PEP8/SortIgnoringStyle", | 1933 "PEP8/SortIgnoringStyle", |
| 1931 defaultParameters["ImportsChecker"]["SortIgnoringStyle"], | 1934 defaultParameters["NameOrderChecker"]["SortIgnoringStyle"], |
| 1932 ) | 1935 ) |
| 1933 ) | 1936 ) |
| 1934 ) | 1937 ) |
| 1935 self.sortFromFirstCheckBox.setChecked( | 1938 self.sortFromFirstCheckBox.setChecked( |
| 1936 Preferences.toBool( | 1939 Preferences.toBool( |
| 1937 settings.value( | 1940 settings.value( |
| 1938 "PEP8/SortFromFirst", | 1941 "PEP8/SortFromFirst", |
| 1939 defaultParameters["ImportsChecker"]["SortFromFirst"], | 1942 defaultParameters["NameOrderChecker"]["SortFromFirst"], |
| 1940 ) | 1943 ) |
| 1941 ) | 1944 ) |
| 1942 ) | 1945 ) |
| 1943 | 1946 |
| 1944 self.__cleanupData() | 1947 self.__cleanupData() |
| 2257 ) | 2260 ) |
| 2258 settings.setValue( | 2261 settings.setValue( |
| 2259 "PEP8/BanRelativeImports", | 2262 "PEP8/BanRelativeImports", |
| 2260 defaultParameters["ImportsChecker"]["BanRelativeImports"], | 2263 defaultParameters["ImportsChecker"]["BanRelativeImports"], |
| 2261 ) | 2264 ) |
| 2265 | |
| 2266 # Name Order Checker | |
| 2262 settings.setValue( | 2267 settings.setValue( |
| 2263 "PEP8/SortOrder", | 2268 "PEP8/SortOrder", |
| 2264 defaultParameters["ImportsChecker"]["SortOrder"], | 2269 defaultParameters["NameOrderChecker"]["SortOrder"], |
| 2265 ) | 2270 ) |
| 2266 settings.setValue( | 2271 settings.setValue( |
| 2267 "PEP8/SortCaseSensitive", | 2272 "PEP8/SortCaseSensitive", |
| 2268 defaultParameters["ImportsChecker"]["SortCaseSensitive"], | 2273 defaultParameters["NameOrderChecker"]["SortCaseSensitive"], |
| 2269 ) | 2274 ) |
| 2270 settings.setValue( | 2275 settings.setValue( |
| 2271 "PEP8/CombinedAsImports", | 2276 "PEP8/CombinedAsImports", |
| 2272 defaultParameters["ImportsChecker"]["CombinedAsImports"], | 2277 defaultParameters["NameOrderChecker"]["CombinedAsImports"], |
| 2273 ) | 2278 ) |
| 2274 settings.setValue( | 2279 settings.setValue( |
| 2275 "PEP8/SortIgnoringStyle", | 2280 "PEP8/SortIgnoringStyle", |
| 2276 defaultParameters["ImportsChecker"]["SortIgnoringStyle"], | 2281 defaultParameters["NameOrderChecker"]["SortIgnoringStyle"], |
| 2277 ) | 2282 ) |
| 2278 settings.setValue( | 2283 settings.setValue( |
| 2279 "PEP8/SortFromFirst", | 2284 "PEP8/SortFromFirst", |
| 2280 defaultParameters["ImportsChecker"]["SortFromFirst"], | 2285 defaultParameters["NameOrderChecker"]["SortFromFirst"], |
| 2281 ) | 2286 ) |
| 2282 | 2287 |
| 2283 # Update UI with default values | 2288 # Update UI with default values |
| 2284 self.on_loadDefaultButton_clicked() | 2289 self.on_loadDefaultButton_clicked() |
| 2285 | 2290 |
