Mercurial Repositories > Flask Project / changeset

--- a/ChangeLog	Sat Nov 26 17:43:53 2022 +0100
+++ b/ChangeLog	Wed Dec 21 09:59:34 2022 +0100
@@ -1,5 +1,8 @@
 ChangeLog
 ---------
+Version 10.4.0
+- adapted some import statements to eric 23.1 and newer
+
 Version 10.3.0:
 - adapted to the project browser changes as of eric 22.12
 

--- a/PluginFlask.epj	Sat Nov 26 17:43:53 2022 +0100
+++ b/PluginFlask.epj	Wed Dec 21 09:59:34 2022 +0100
@@ -235,10 +235,11 @@
         "profile": "black",
         "sort_order": "natural",
         "supported_extensions": [
+          "py",
+          "pyi",
+          "pyx",
           "pxd",
-          "py",
-          "pyx",
-          "pyi"
+          "pyw"
         ]
       }
     },

--- a/PluginProjectFlask.py	Sat Nov 26 17:43:53 2022 +0100
+++ b/PluginProjectFlask.py	Wed Dec 21 09:59:34 2022 +0100
@@ -15,7 +15,12 @@
 
 from eric7 import Preferences
 from eric7.EricWidgets.EricApplication import ericApp
-from eric7.Globals import isMacPlatform, isWindowsPlatform
+
+try:
+    from eric7.SystemUtilities.OSUtilities import isMacPlatform, isWindowsPlatform
+except ImportError:
+    # imports for eric < 23.1
+    from eric7.Globals import isMacPlatform, isWindowsPlatform
 from ProjectFlask.Project import Project
 
 # Start-of-Header
@@ -23,7 +28,7 @@
 author = "Detlev Offenbach <detlev@die-offenbachs.de>"
 autoactivate = True
 deactivateable = True
-version = "10.3.0"
+version = "10.4.0"
 className = "ProjectFlaskPlugin"
 packageName = "ProjectFlask"
 shortDescription = "Project support for Flask projects."

Binary file PluginProjectFlask.zip has changed

--- a/ProjectFlask/ConfigurationPage/FlaskPage.py	Sat Nov 26 17:43:53 2022 +0100
+++ b/ProjectFlask/ConfigurationPage/FlaskPage.py	Wed Dec 21 09:59:34 2022 +0100
@@ -16,11 +16,16 @@
 
 from eric7.EricWidgets.EricApplication import ericApp
 from eric7.EricWidgets.EricPathPicker import EricPathPickerModes
-from eric7.Globals import isMacPlatform, isWindowsPlatform
 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 isMacPlatform, isWindowsPlatform
+
 from .. import AnsiTools
 from .Ui_FlaskPage import Ui_FlaskPage
 

--- a/ProjectFlask/FlaskBabelExtension/PyBabelProjectExtension.py	Sat Nov 26 17:43:53 2022 +0100
+++ b/ProjectFlask/FlaskBabelExtension/PyBabelProjectExtension.py	Wed Dec 21 09:59:34 2022 +0100
@@ -14,11 +14,16 @@
 from PyQt6.QtCore import QObject, QProcess, pyqtSlot
 from PyQt6.QtWidgets import QDialog, QMenu
 
-from eric7 import Utilities
 from eric7.EricGui.EricAction import EricAction
 from eric7.EricWidgets import EricMessageBox
 from eric7.EricWidgets.EricApplication import ericApp
 
+try:
+    from eric7.SystemUtilities.FileSystemUtilities import isinpath
+except ImportError:
+    # imports for eric < 23.1
+    from eric7.Utilities import isinpath
+
 from .PyBabelCommandDialog import PyBabelCommandDialog
 
 
@@ -254,7 +259,7 @@
         @rtype bool
         """
         interpreter = self.__project.getVirtualenvInterpreter()
-        if interpreter and Utilities.isinpath(interpreter):
+        if interpreter and isinpath(interpreter):
             detector = os.path.join(os.path.dirname(__file__), "FlaskBabelDetector.py")
             proc = QProcess()
             proc.setProcessChannelMode(QProcess.ProcessChannelMode.MergedChannels)

--- a/ProjectFlask/FlaskMigrateExtension/MigrateProjectExtension.py	Sat Nov 26 17:43:53 2022 +0100
+++ b/ProjectFlask/FlaskMigrateExtension/MigrateProjectExtension.py	Wed Dec 21 09:59:34 2022 +0100
@@ -13,11 +13,16 @@
 from PyQt6.QtCore import QObject, QProcess, pyqtSlot
 from PyQt6.QtWidgets import QDialog, QInputDialog, QLineEdit, QMenu
 
-from eric7 import Utilities
 from eric7.EricGui.EricAction import EricAction
 from eric7.EricWidgets import EricMessageBox
 from eric7.EricWidgets.EricApplication import ericApp
 
+try:
+    from eric7.SystemUtilities.FileSystemUtilities import isinpath
+except ImportError:
+    # imports for eric < 23.1
+    from eric7.Utilities import isinpath
+
 from ..FlaskCommandDialog import FlaskCommandDialog
 
 
@@ -317,7 +322,7 @@
         @rtype bool
         """
         interpreter = self.__project.getVirtualenvInterpreter()
-        if interpreter and Utilities.isinpath(interpreter):
+        if interpreter and isinpath(interpreter):
             detector = os.path.join(
                 os.path.dirname(__file__), "FlaskMigrateDetector.py"
             )

--- a/ProjectFlask/FlaskVirtualenvConfigurationDialog.py	Sat Nov 26 17:43:53 2022 +0100
+++ b/ProjectFlask/FlaskVirtualenvConfigurationDialog.py	Wed Dec 21 09:59:34 2022 +0100
@@ -14,9 +14,14 @@
 from PyQt6.QtCore import pyqtSlot
 from PyQt6.QtWidgets import QDialog, QDialogButtonBox
 
-from eric7 import Utilities
 from eric7.EricWidgets.EricPathPicker import EricPathPickerModes
 
+try:
+    from eric7.SystemUtilities.FileSystemUtilities import toNativeSeparators
+except ImportError:
+    # imports for eric < 23.1
+    from eric7.Utilities import toNativeSeparators
+
 from .Ui_FlaskVirtualenvConfigurationDialog import Ui_FlaskVirtualenvConfigurationDialog
 
 
@@ -103,7 +108,7 @@
         @return target directory path
         @rtype str
         """
-        targetDirectory = Utilities.toNativeSeparators(
+        targetDirectory = toNativeSeparators(
             self.targetDirectoryPicker.text()
         )
         if not os.path.isabs(targetDirectory):
@@ -138,7 +143,7 @@
             "createLog": False,
             "createScript": False,
             "targetDirectory": self.__generateTargetDir(),
-            "pythonExe": Utilities.toNativeSeparators(self.pythonExecPicker.text()),
+            "pythonExe": toNativeSeparators(self.pythonExecPicker.text()),
         }
 
         return resultDict

--- a/ProjectFlask/Project.py	Sat Nov 26 17:43:53 2022 +0100
+++ b/ProjectFlask/Project.py	Wed Dec 21 09:59:34 2022 +0100
@@ -23,13 +23,26 @@
 from eric7.EricGui.EricAction import EricAction
 from eric7.EricWidgets import EricFileDialog, EricMessageBox
 from eric7.EricWidgets.EricApplication import ericApp
-from eric7.Globals import isWindowsPlatform
 
 try:
     from eric7.EricGui import EricPixmapCache
 except ImportError:
     from UI import PixmapCache as EricPixmapCache
 
+try:
+    from eric7.SystemUtilities.FileSystemUtilities import (
+        getExecutablePath,
+        getExecutablePaths,
+    )
+except ImportError:
+    # imports for eric < 23.1
+    from eric7.Utilities import getExecutablePath, getExecutablePaths
+try:
+    from eric7.SystemUtilities.OSUtilities import isWindowsPlatform
+except ImportError:
+    # imports for eric < 23.1
+    from eric7.Globals import isWindowsPlatform
+
 from .FlaskBabelExtension.PyBabelProjectExtension import PyBabelProject
 from .FlaskMigrateExtension.MigrateProjectExtension import MigrateProject
 
@@ -481,7 +494,7 @@
             else [
                 os.path.join(virtualEnv, "bin", command),
                 os.path.join(virtualEnv, "local", "bin", command),
-                Utilities.getExecutablePath(command),
+                getExecutablePath(command),
                 command,
             ]  # fall back to just cmd
         )
@@ -524,7 +537,7 @@
                 if fullCmd:
                     variants.append("Python3")
             else:
-                fullCmds = Utilities.getExecutablePaths("flask")
+                fullCmds = getExecutablePaths("flask")
                 for fullCmd in fullCmds:
                     try:
                         with open(fullCmd, "r", encoding="utf-8") as f:
@@ -885,7 +898,7 @@
                 self.__terminatePythonShell()
 
                 args = Utilities.parseOptionString(consoleCmd)
-                args[0] = Utilities.getExecutablePath(args[0])
+                args[0] = getExecutablePath(args[0])
                 args += [command, "shell"]
 
                 self.__shellProcess = QProcess()

--- a/pyproject.toml	Sat Nov 26 17:43:53 2022 +0100
+++ b/pyproject.toml	Wed Dec 21 09:59:34 2022 +0100
@@ -7,4 +7,4 @@
     "*/Ui_*.py",
 ]
 combine_as_imports = true
-known_first_party = ["eric7"]
+known_first_party = ["ProjectFlask", "eric7"]