Mercurial Repositories > Django Project / changeset

diff -r 6d0d13de1005 -r b08c2cb2e0a0 ChangeLog
--- a/ChangeLog	Sat Nov 26 17:32:34 2022 +0100
+++ b/ChangeLog	Wed Dec 21 09:27:28 2022 +0100
@@ -1,5 +1,8 @@
 ChangeLog
 ---------
+Version 10.3.0
+- adapted some import statements to eric 23.1 and newer
+
 Version 10.2.0:
 - adapted to the project browser changes as of eric 22.12
 

diff -r 6d0d13de1005 -r b08c2cb2e0a0 PluginDjango.epj
--- a/PluginDjango.epj	Sat Nov 26 17:32:34 2022 +0100
+++ b/PluginDjango.epj	Wed Dec 21 09:27:28 2022 +0100
@@ -207,7 +207,8 @@
       "ProjectDjango/icons/django-dark.svg",
       "ProjectDjango/icons/django-light.svg",
       "ProjectDjango/icons/django64-dark.svg",
-      "ProjectDjango/icons/django64-light.svg"
+      "ProjectDjango/icons/django64-light.svg",
+      "pyproject.toml"
     ],
     "OTHERTOOLSPARMS": {
       "Black": {
@@ -225,6 +226,23 @@
           "py38",
           "py37"
         ]
+      },
+      "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": {},

diff -r 6d0d13de1005 -r b08c2cb2e0a0 PluginProjectDjango.py
--- a/PluginProjectDjango.py	Sat Nov 26 17:32:34 2022 +0100
+++ b/PluginProjectDjango.py	Wed Dec 21 09:27:28 2022 +0100
@@ -15,7 +15,12 @@
 
 from eric7 import Preferences
 from eric7.EricWidgets.EricApplication import ericApp
-from eric7.Globals import isWindowsPlatform, isMacPlatform
+
+try:
+    from eric7.SystemUtilities.OSUtilities import isMacPlatform, isWindowsPlatform
+except ImportError:
+    # imports for eric < 23.1
+    from eric7.Globals import isWindowsPlatform, isMacPlatform
 
 from ProjectDjango.Project import Project
 
@@ -24,7 +29,7 @@
 author = "Detlev Offenbach <detlev@die-offenbachs.de>"
 autoactivate = True
 deactivateable = True
-version = "10.2.0"
+version = "10.3.0"
 className = "ProjectDjangoPlugin"
 packageName = "ProjectDjango"
 shortDescription = "Project support for Django projects."
@@ -204,10 +209,10 @@
         try:
             # backward compatibility for eric7 < 22.12
             from eric7.Project.ProjectBrowser import (
+                FormsBrowserFlag,
+                OthersBrowserFlag,
                 SourcesBrowserFlag,
-                FormsBrowserFlag,
                 TranslationsBrowserFlag,
-                OthersBrowserFlag,
             )
 
             Preferences.setProjectBrowserFlagsDefault(

diff -r 6d0d13de1005 -r b08c2cb2e0a0 PluginProjectDjango.zip
Binary file PluginProjectDjango.zip has changed

diff -r 6d0d13de1005 -r b08c2cb2e0a0 ProjectDjango/ConfigurationPage/DjangoPage.py
--- a/ProjectDjango/ConfigurationPage/DjangoPage.py	Sat Nov 26 17:32:34 2022 +0100
+++ b/ProjectDjango/ConfigurationPage/DjangoPage.py	Wed Dec 21 09:27:28 2022 +0100
@@ -9,11 +9,16 @@
 
 from eric7.EricWidgets.EricApplication import ericApp
 from eric7.EricWidgets.EricPathPicker import EricPathPickerModes
-from eric7.Globals import isWindowsPlatform, isMacPlatform
 from eric7.Preferences.ConfigurationPages.ConfigurationPageBase import (
     ConfigurationPageBase,
 )
 
+try:
+    from eric7.SystemUtilities.OSUtilities import isMacPlatform, isWindowsPlatform
+except ImportError:
+    # imports for eric < 23.1
+    from eric7.Globals import isWindowsPlatform, isMacPlatform
+
 from .Ui_DjangoPage import Ui_DjangoPage
 
 

diff -r 6d0d13de1005 -r b08c2cb2e0a0 ProjectDjango/DjangoCheckOptionsDialog.py
--- a/ProjectDjango/DjangoCheckOptionsDialog.py	Sat Nov 26 17:32:34 2022 +0100
+++ b/ProjectDjango/DjangoCheckOptionsDialog.py	Wed Dec 21 09:27:28 2022 +0100
@@ -9,17 +9,27 @@
 
 import os
 
-from PyQt6.QtCore import pyqtSlot, Qt, QProcess
+from PyQt6.QtCore import QProcess, Qt, pyqtSlot
 from PyQt6.QtWidgets import QDialog
 
-from eric7 import Preferences, Utilities
+from eric7 import Preferences
 
 try:
     from eric7.EricGui import EricPixmapCache
 except ImportError:
     from UI import PixmapCache as EricPixmapCache
+
 from eric7.EricWidgets import EricFileDialog
 
+try:
+    from eric7.SystemUtilities.FileSystemUtilities import (
+        relativeUniversalPath,
+        toNativeSeparators,
+    )
+except ImportError:
+    # imports for eric < 23.1
+    from eric7.Utilities import relativeUniversalPath, toNativeSeparators
+
 from .Ui_DjangoCheckOptionsDialog import Ui_DjangoCheckOptionsDialog
 
 
@@ -93,7 +103,7 @@
         @rtype str
         """
         start = self.__path[:-1] if self.__path.endswith(("/", "\\")) else self.__path
-        relPath = Utilities.relativeUniversalPath(path, start)
+        relPath = relativeUniversalPath(path, start)
         mod = os.path.splitext(relPath)[0].replace("/", ".")
         return mod
 
@@ -111,7 +121,7 @@
             if not os.path.isabs(mod):
                 mod = os.path.join(self.__path, mod)
 
-            path = Utilities.toNativeSeparators(mod)
+            path = toNativeSeparators(mod)
         else:
             path = ""
         return path

diff -r 6d0d13de1005 -r b08c2cb2e0a0 ProjectDjango/DjangoDialog.py
--- a/ProjectDjango/DjangoDialog.py	Sat Nov 26 17:32:34 2022 +0100
+++ b/ProjectDjango/DjangoDialog.py	Wed Dec 21 09:27:28 2022 +0100
@@ -9,18 +9,24 @@
 
 import os
 
-from PyQt6.QtCore import pyqtSlot, QProcess, QTimer, QFileInfo
+from PyQt6.QtCore import QFileInfo, QProcess, QTimer, pyqtSlot
 from PyQt6.QtWidgets import (
+    QAbstractButton,
     QDialog,
     QDialogButtonBox,
-    QAbstractButton,
+    QLineEdit,
     QTextEdit,
-    QLineEdit,
 )
 
 from eric7 import Preferences
-from eric7.EricWidgets import EricMessageBox, EricFileDialog
-from eric7.Globals import isWindowsPlatform, strToQByteArray
+from eric7.EricWidgets import EricFileDialog, EricMessageBox
+from eric7.Globals import strToQByteArray
+
+try:
+    from eric7.SystemUtilities.OSUtilities import isWindowsPlatform
+except ImportError:
+    # imports for eric < 23.1
+    from eric7.Globals import isWindowsPlatform
 
 from .Ui_DjangoDialog import Ui_DjangoDialog
 

diff -r 6d0d13de1005 -r b08c2cb2e0a0 ProjectDjango/DjangoLoaddataDataDialog.py
--- a/ProjectDjango/DjangoLoaddataDataDialog.py	Sat Nov 26 17:32:34 2022 +0100
+++ b/ProjectDjango/DjangoLoaddataDataDialog.py	Wed Dec 21 09:27:28 2022 +0100
@@ -12,14 +12,18 @@
 from PyQt6.QtCore import pyqtSlot
 from PyQt6.QtWidgets import QDialog, QDialogButtonBox
 
-from eric7 import Utilities
-
 try:
     from eric7.EricGui import EricPixmapCache
 except ImportError:
     from UI import PixmapCache as EricPixmapCache
 from eric7.EricWidgets import EricFileDialog
 
+try:
+    from eric7.SystemUtilities.FileSystemUtilities import toNativeSeparators
+except ImportError:
+    # imports for eric < 23.1
+    from eric7.Utilities import toNativeSeparators
+
 from .Ui_DjangoLoaddataDataDialog import Ui_DjangoLoaddataDataDialog
 
 
@@ -79,7 +83,7 @@
 
         if fixtureFiles:
             self.fixturesEdit.setText(
-                " ".join([Utilities.toNativeSeparators(f) for f in fixtureFiles])
+                " ".join([toNativeSeparators(f) for f in fixtureFiles])
             )
 
     def getData(self):

diff -r 6d0d13de1005 -r b08c2cb2e0a0 ProjectDjango/DjangoMigrationsListDialog.py
--- a/ProjectDjango/DjangoMigrationsListDialog.py	Sat Nov 26 17:32:34 2022 +0100
+++ b/ProjectDjango/DjangoMigrationsListDialog.py	Wed Dec 21 09:27:28 2022 +0100
@@ -7,17 +7,17 @@
 Module implementing a dialog show a list of all available migrations.
 """
 
-from PyQt6.QtCore import pyqtSlot, Qt, QProcess, QTimer, QPoint
+from PyQt6.QtCore import QPoint, QProcess, Qt, QTimer, pyqtSlot
 from PyQt6.QtWidgets import (
+    QAbstractButton,
+    QAbstractItemView,
     QDialog,
     QDialogButtonBox,
-    QAbstractButton,
     QHeaderView,
-    QTreeWidgetItem,
-    QMenu,
-    QAbstractItemView,
     QInputDialog,
     QLineEdit,
+    QMenu,
+    QTreeWidgetItem,
 )
 
 from eric7 import Preferences

diff -r 6d0d13de1005 -r b08c2cb2e0a0 ProjectDjango/Project.py
--- a/ProjectDjango/Project.py	Sat Nov 26 17:32:34 2022 +0100
+++ b/ProjectDjango/Project.py	Wed Dec 21 09:27:28 2022 +0100
@@ -12,10 +12,16 @@
 import re
 import shutil
 
-from PyQt6.QtCore import QObject, QTimer, QUrl, QFileInfo, QIODeviceBase
+from PyQt6.QtCore import (
+    QFileInfo,
+    QIODeviceBase,
+    QObject,
+    QProcess as QProcessPyQt,
+    QTimer,
+    QUrl,
+)
 from PyQt6.QtGui import QDesktopServices
-from PyQt6.QtWidgets import QMenu, QInputDialog, QLineEdit, QDialog
-from PyQt6.QtCore import QProcess as QProcessPyQt
+from PyQt6.QtWidgets import QDialog, QInputDialog, QLineEdit, QMenu
 
 from eric7 import Preferences, Utilities
 
@@ -23,10 +29,25 @@
     from eric7.EricGui import EricPixmapCache
 except ImportError:
     from UI import PixmapCache as EricPixmapCache
+
 from eric7.EricGui.EricAction import EricAction
-from eric7.EricWidgets import EricMessageBox, EricFileDialog
+from eric7.EricWidgets import EricFileDialog, EricMessageBox
 from eric7.EricWidgets.EricApplication import ericApp
-from eric7.Globals import isWindowsPlatform
+
+try:
+    from eric7.SystemUtilities.OSUtilities import isWindowsPlatform
+except ImportError:
+    # imports for eric < 23.1
+    from eric7.Globals import isWindowsPlatform
+try:
+    from eric7.SystemUtilities.FileSystemUtilities import (
+        getExecutablePath,
+        getExecutablePaths,
+        isinpath,
+    )
+except ImportError:
+    # imports for eric < 23.1
+    from eric7.Utilities import getExecutablePath, getExecutablePaths, isinpath
 
 from .DjangoDialog import DjangoDialog
 
@@ -1374,7 +1395,7 @@
                 else:
                     if cmd:
                         try:
-                            fullCmds = Utilities.getExecutablePaths(cmd)
+                            fullCmds = getExecutablePaths(cmd)
                         except AttributeError:
                             fullCmds = self.__getExecutablePaths(cmd)
                         for fullCmd in fullCmds:
@@ -1529,7 +1550,7 @@
                     cmds = []
                 cmds.extend(["django-admin", "django-admin.py"])
                 for cmd in cmds:
-                    if Utilities.isinpath(cmd):
+                    if isinpath(cmd):
                         break
                 else:
                     cmd = ""
@@ -1898,7 +1919,7 @@
         args = []
         cmd = self.__getDjangoAdminCommand()
         if cmd:
-            if Utilities.isWindowsPlatform():
+            if isWindowsPlatform():
                 args.append(self.__getPythonExecutable())
             args.append(cmd)
         else:
@@ -1980,7 +2001,7 @@
         if isGlobal:
             cmd = self.__getDjangoAdminCommand()
             if cmd:
-                if Utilities.isWindowsPlatform():
+                if isWindowsPlatform():
                     args.append(self.__getPythonExecutable())
                 args.append(cmd)
             else:
@@ -2172,7 +2193,7 @@
         )[1]
         if consoleCmd:
             args = Utilities.parseOptionString(consoleCmd)
-            args[0] = Utilities.getExecutablePath(args[0])
+            args[0] = getExecutablePath(args[0])
             args.append(self.__getPythonExecutable())
             args.append("manage.py")
             args.append("runserver")
@@ -2185,7 +2206,7 @@
                 args.append(addr)
 
             with contextlib.suppress(DjangoNoSiteSelectedError):
-                if Utilities.isWindowsPlatform():
+                if isWindowsPlatform():
                     serverProcStarted, pid = QProcess.startDetached(
                         args[0], args[1:], self.__sitePath()
                     )
@@ -2431,7 +2452,7 @@
         )[1]
         if consoleCmd:
             args = Utilities.parseOptionString(consoleCmd)
-            args[0] = Utilities.getExecutablePath(args[0])
+            args[0] = getExecutablePath(args[0])
             args.append(self.__getPythonExecutable())
             args.append("manage.py")
             args.append("dbshell")
@@ -2882,7 +2903,7 @@
         )[1]
         if consoleCmd:
             args = Utilities.parseOptionString(consoleCmd)
-            args[0] = Utilities.getExecutablePath(args[0])
+            args[0] = getExecutablePath(args[0])
             args.append(self.__getPythonExecutable())
             args.append("manage.py")
             args.append("shell")
@@ -3078,7 +3099,7 @@
                 self.__plugin.setPreferences("KeepTestDatabase", keep)
 
                 args = Utilities.parseOptionString(consoleCmd)
-                args[0] = Utilities.getExecutablePath(args[0])
+                args[0] = getExecutablePath(args[0])
                 args.append(self.__getPythonExecutable())
                 if deprecation:
                     args.append("-Wall")
@@ -3121,7 +3142,7 @@
                 fixtures = dlg.getData()
 
                 args = Utilities.parseOptionString(consoleCmd)
-                args[0] = Utilities.getExecutablePath(args[0])
+                args[0] = getExecutablePath(args[0])
                 args.append(self.__getPythonExecutable())
                 args.append("manage.py")
                 args.append("testserver")
@@ -3133,7 +3154,7 @@
                 args += fixtures
 
                 with contextlib.suppress(DjangoNoSiteSelectedError):
-                    if Utilities.isWindowsPlatform():
+                    if isWindowsPlatform():
                         serverProcStarted, pid = QProcess.startDetached(
                             args[0], args[1:], self.__sitePath()
                         )
@@ -3188,7 +3209,7 @@
             )
             if ok and userName != "":
                 args = Utilities.parseOptionString(consoleCmd)
-                args[0] = Utilities.getExecutablePath(args[0])
+                args[0] = getExecutablePath(args[0])
                 args.append(self.__getPythonExecutable())
                 args.append("manage.py")
                 args.append("changepassword")
@@ -3213,7 +3234,7 @@
         )[1]
         if consoleCmd:
             args = Utilities.parseOptionString(consoleCmd)
-            args[0] = Utilities.getExecutablePath(args[0])
+            args[0] = getExecutablePath(args[0])
             args.append(self.__getPythonExecutable())
             args.append("manage.py")
             args.append("createsuperuser")

diff -r 6d0d13de1005 -r b08c2cb2e0a0 pyproject.toml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pyproject.toml	Wed Dec 21 09:27:28 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 = ["ProjectDjango", "eric7"]