Mercurial Repositories > Vulture Checker / changeset

--- a/ChangeLog	Mon Oct 24 17:25:26 2022 +0200
+++ b/ChangeLog	Tue Dec 20 19:52:15 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/PluginCheckerVulture.epj	Mon Oct 24 17:25:26 2022 +0200
+++ b/PluginCheckerVulture.epj	Tue Dec 20 19:52:15 2022 +0100
@@ -209,7 +209,8 @@
       "PluginCheckerVulture.epj",
       "PluginVulture.zip",
       "VultureChecker/Documentation/LICENSE.GPL3",
-      "VultureChecker/Documentation/source"
+      "VultureChecker/Documentation/source",
+      "pyproject.toml"
     ],
     "OTHERTOOLSPARMS": {
       "Black": {
@@ -227,6 +228,23 @@
           "py310",
           "py311"
         ]
+      },
+      "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": {},
@@ -266,6 +284,7 @@
       "VultureChecker/i18n/vulture_ru.ts"
     ],
     "TRANSLATIONSBINPATH": "",
+    "TRANSLATIONSOURCESTARTPATH": "",
     "UICPARAMS": {
       "Package": "",
       "PackagesRoot": "",

--- a/PluginVulture.py	Mon Oct 24 17:25:26 2022 +0200
+++ b/PluginVulture.py	Tue Dec 20 19:52:15 2022 +0100
@@ -9,21 +9,24 @@
 
 import os
 
-from PyQt6.QtCore import pyqtSignal, QObject, QTranslator
+from PyQt6.QtCore import QObject, QTranslator, pyqtSignal
 
 from eric7 import Preferences
-
 from eric7.EricGui.EricAction import EricAction
 from eric7.EricWidgets.EricApplication import ericApp
 
-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 = "Unused Code Checker Plug-in"
 author = "Detlev Offenbach <detlev@die-offenbachs.de>"
 autoactivate = True
 deactivateable = True
-version = "10.1.0"
+version = "10.2.0"
 className = "VulturePlugin"
 packageName = "VultureChecker"
 shortDescription = "Plug-in to detect unused code using the 'vulture' library"

Binary file PluginVulture.zip has changed

--- a/VultureChecker/VultureCheckerDialog.py	Mon Oct 24 17:25:26 2022 +0200
+++ b/VultureChecker/VultureCheckerDialog.py	Tue Dec 20 19:52:15 2022 +0100
@@ -7,24 +7,29 @@
 Module implementing a dialog to show the vulture check results.
 """
 
-import os
+import contextlib
 import fnmatch
-import contextlib
+import os
 
-from PyQt6.QtCore import pyqtSlot, Qt, QTimer
+from PyQt6.QtCore import Qt, QTimer, pyqtSlot
 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
 
-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_VultureCheckerDialog import Ui_VultureCheckerDialog
 
@@ -214,7 +219,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/VultureChecker/VultureCheckerService.py	Mon Oct 24 17:25:26 2022 +0200
+++ b/VultureChecker/VultureCheckerService.py	Tue Dec 20 19:52:15 2022 +0100
@@ -7,8 +7,8 @@
 Module implementing the cyclomatic complexity service.
 """
 
+import multiprocessing
 import queue
-import multiprocessing
 
 from vulture import Vulture
 

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pyproject.toml	Tue Dec 20 19:52:15 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 = ["VultureChecker", "eric7"]