Mercurial Repositories > Radon Code Metrics / changeset
changeset
Adapted some import statements to eric 23.1 and newer.
Wed, 21 Dec 2022 08:52:36 +0100
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Wed, 21 Dec 2022 08:52:36 +0100
- branch
- eric7
- changeset 104
- 6eac83394939
- parent 103
- 3fcdd23d144d
- child 105
- 46437a551bc2
Adapted some import statements to eric 23.1 and newer.
--- a/ChangeLog Mon Oct 24 17:38:28 2022 +0200 +++ b/ChangeLog Wed Dec 21 08:52:36 2022 +0100 @@ -1,5 +1,8 @@ ChangeLog --------- +Version 10.2.0 +- adapted some import statements to eric 23.1 and newer + Version 10.1.0 - adapted the import statements to the new structure
--- a/PluginMetricsRadon.epj Mon Oct 24 17:38:28 2022 +0200 +++ b/PluginMetricsRadon.epj Wed Dec 21 08:52:36 2022 +0100 @@ -193,7 +193,8 @@ "PluginMetricsRadon.epj", "PluginMetricsRadon.zip", "RadonMetrics/Documentation/LICENSE.GPL3", - "RadonMetrics/Documentation/source" + "RadonMetrics/Documentation/source", + "pyproject.toml" ], "OTHERTOOLSPARMS": { "Black": { @@ -215,6 +216,23 @@ "RadonCodeMetrics": { "ExcludeFiles": "", "MinimumRank": "C" + }, + "isort": { + "combine_as_imports": true, + "config_source": "project", + "extend_skip_glob": [ + "*/Ui_*.py" + ], + "lines_between_types": 1, + "profile": "black", + "sort_order": "natural", + "supported_extensions": [ + "py", + "pyi", + "pyx", + "pxd", + "pyw" + ] } }, "PACKAGERSPARMS": {},
--- a/PluginMetricsRadon.py Mon Oct 24 17:38:28 2022 +0200 +++ b/PluginMetricsRadon.py Wed Dec 21 08:52:36 2022 +0100 @@ -10,7 +10,7 @@ import contextlib import os -from PyQt6.QtCore import pyqtSignal, QObject, QTranslator +from PyQt6.QtCore import QObject, QTranslator, pyqtSignal from PyQt6.QtGui import QAction from eric7 import Preferences @@ -18,14 +18,19 @@ from eric7.EricWidgets import EricMessageBox from eric7.EricWidgets.EricApplication import ericApp from eric7.Project.ProjectBrowserModel import ProjectBrowserFileItem -from eric7.Utilities import determinePythonVersion + +try: + from eric7.SystemUtilities.PythonUtilities import determinePythonVersion +except ImportError: + # imports for eric < 23.1 + from eric7.Utilities import determinePythonVersion # Start-Of-Header name = "Radon Metrics Plugin" author = "Detlev Offenbach <detlev@die-offenbachs.de>" autoactivate = True deactivateable = True -version = "10.1.0" +version = "10.2.0" className = "RadonMetricsPlugin" packageName = "RadonMetrics" shortDescription = "Code metrics plugin using radon package" @@ -1058,6 +1063,7 @@ """ try: from radon import __version__ as radon_version + from eric7 import Globals if Globals.versionToTuple(radon_version) < (4, 5, 0):
--- a/RadonMetrics/CodeMetricsCalculator.py Mon Oct 24 17:38:28 2022 +0200 +++ b/RadonMetrics/CodeMetricsCalculator.py Wed Dec 21 08:52:36 2022 +0100 @@ -7,8 +7,8 @@ Module implementing the raw code metrics service. """ +import multiprocessing import queue -import multiprocessing def initService():
--- a/RadonMetrics/CyclomaticComplexityCalculator.py Mon Oct 24 17:38:28 2022 +0200 +++ b/RadonMetrics/CyclomaticComplexityCalculator.py Wed Dec 21 08:52:36 2022 +0100 @@ -7,8 +7,8 @@ Module implementing the cyclomatic complexity service. """ +import multiprocessing import queue -import multiprocessing def initService(): @@ -149,7 +149,7 @@ @return tuple containing the result dictionary @rtype (tuple of dict) """ - from radon.complexity import cc_visit, cc_rank + from radon.complexity import cc_rank, cc_visit try: cc = cc_visit(text)
--- a/RadonMetrics/CyclomaticComplexityDialog.py Mon Oct 24 17:38:28 2022 +0200 +++ b/RadonMetrics/CyclomaticComplexityDialog.py Wed Dec 21 08:52:36 2022 +0100 @@ -8,24 +8,30 @@ complexity). """ +import fnmatch import os -import fnmatch -from PyQt6.QtCore import pyqtSlot, Qt, QTimer, QLocale +from PyQt6.QtCore import QLocale, Qt, QTimer, pyqtSlot from PyQt6.QtGui import QColor from PyQt6.QtWidgets import ( + QAbstractButton, + QApplication, QDialog, QDialogButtonBox, - QAbstractButton, QHeaderView, + QMenu, QTreeWidgetItem, - QApplication, - QMenu, ) from eric7 import Preferences, Utilities from eric7.EricWidgets.EricApplication import ericApp +try: + from eric7.SystemUtilities.FileSystemUtilities import direntries +except ImportError: + # imports for eric < 23.1 + from eric7.Utilities import direntries + from .Ui_CyclomaticComplexityDialog import Ui_CyclomaticComplexityDialog @@ -293,7 +299,7 @@ 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(direntries(fn, True, "*{0}".format(ext), 0)) else: self.files = [fn] self.files.sort()
--- a/RadonMetrics/MaintainabilityIndexCalculator.py Mon Oct 24 17:38:28 2022 +0200 +++ b/RadonMetrics/MaintainabilityIndexCalculator.py Wed Dec 21 08:52:36 2022 +0100 @@ -7,8 +7,8 @@ Module implementing the maintainability index service. """ +import multiprocessing import queue -import multiprocessing def initService(): @@ -149,7 +149,7 @@ @return tuple containing the result dictionary @rtype (tuple of dict) """ - from radon.metrics import mi_visit, mi_rank + from radon.metrics import mi_rank, mi_visit try: mi = mi_visit(text, True)
--- a/RadonMetrics/MaintainabilityIndexDialog.py Mon Oct 24 17:38:28 2022 +0200 +++ b/RadonMetrics/MaintainabilityIndexDialog.py Wed Dec 21 08:52:36 2022 +0100 @@ -7,23 +7,29 @@ Module implementing a dialog to show maintainability indexes. """ +import fnmatch import os -import fnmatch -from PyQt6.QtCore import pyqtSlot, Qt, QTimer, QLocale +from PyQt6.QtCore import QLocale, Qt, QTimer, pyqtSlot from PyQt6.QtGui import QColor from PyQt6.QtWidgets import ( + QAbstractButton, + QApplication, QDialog, QDialogButtonBox, - QAbstractButton, QHeaderView, QTreeWidgetItem, - QApplication, ) from eric7 import Preferences, Utilities from eric7.EricWidgets.EricApplication import ericApp +try: + from eric7.SystemUtilities.FileSystemUtilities import direntries +except ImportError: + # imports for eric < 23.1 + from eric7.Utilities import direntries + from .Ui_MaintainabilityIndexDialog import Ui_MaintainabilityIndexDialog @@ -204,7 +210,7 @@ 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(direntries(fn, True, "*{0}".format(ext), 0)) else: self.files = [fn] self.files.sort()
--- a/RadonMetrics/RawMetricsDialog.py Mon Oct 24 17:38:28 2022 +0200 +++ b/RadonMetrics/RawMetricsDialog.py Wed Dec 21 08:52:36 2022 +0100 @@ -7,22 +7,28 @@ Module implementing a dialog to show raw code metrics. """ +import fnmatch import os -import fnmatch -from PyQt6.QtCore import pyqtSlot, Qt, QTimer, QLocale +from PyQt6.QtCore import QLocale, Qt, QTimer, pyqtSlot from PyQt6.QtWidgets import ( + QAbstractButton, + QApplication, QDialog, QDialogButtonBox, - QAbstractButton, QHeaderView, QTreeWidgetItem, - QApplication, ) from eric7 import Preferences, Utilities from eric7.EricWidgets.EricApplication import ericApp +try: + from eric7.SystemUtilities.FileSystemUtilities import direntries +except ImportError: + # imports for eric < 23.1 + from eric7.Utilities import direntries + from .Ui_RawMetricsDialog import Ui_RawMetricsDialog @@ -207,7 +213,7 @@ 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(direntries(fn, True, "*{0}".format(ext), 0)) else: self.files = [fn] self.files.sort()
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pyproject.toml Wed Dec 21 08:52:36 2022 +0100 @@ -0,0 +1,10 @@ +[tool.isort] +profile = "black" +sort_order = "natural" +supported_extensions = ["py", "pyi", "pyx", "pxd", "pyw"] +lines_between_types = 1 +extend_skip_glob = [ + "*/Ui_*.py", +] +combine_as_imports = true +known_first_party = ["RadonMetrics", "eric7"]
