Mercurial Repositories > Django Project / changeset

--- a/ChangeLog	Wed Sep 21 16:42:20 2022 +0200
+++ b/ChangeLog	Tue Oct 25 10:37:21 2022 +0200
@@ -1,5 +1,8 @@
 ChangeLog
 ---------
+Version 10.1.0
+- adapted the import statements to the new structure
+
 Version 10.0.1:
 - fixed issue 413
 

--- a/PluginDjango.epj	Wed Sep 21 16:42:20 2022 +0200
+++ b/PluginDjango.epj	Tue Oct 25 10:37:21 2022 +0200
@@ -211,7 +211,7 @@
     ],
     "OTHERTOOLSPARMS": {
       "Black": {
-        "exclude": "/(\\.direnv|\\.eggs|\\.git|\\.hg|\\.mypy_cache|\\.nox|\\.tox|\\.venv|venv|\\.svn|_build|buck-out|build|dist|__pypackages__)/",
+        "exclude": "/(\\.direnv|\\.eggs|\\.git|\\.hg|\\.mypy_cache|\\.nox|\\.tox|\\.venv|venv|\\.svn|\\.ipynb_checkpoints|_build|buck-out|build|dist|__pypackages__)/",
         "extend-exclude": "",
         "force-exclude": "",
         "line-length": 88,
@@ -278,6 +278,7 @@
       "ProjectDjango/i18n/django_tr.ts"
     ],
     "TRANSLATIONSBINPATH": "",
+    "TRANSLATIONSOURCESTARTPATH": "",
     "UICPARAMS": {
       "Package": "",
       "PackagesRoot": "",

--- a/PluginProjectDjango.py	Wed Sep 21 16:42:20 2022 +0200
+++ b/PluginProjectDjango.py	Tue Oct 25 10:37:21 2022 +0200
@@ -7,17 +7,15 @@
 Module implementing the Django project plugin.
 """
 
-import os
+import fnmatch
 import glob
-import fnmatch
+import os
 
 from PyQt6.QtCore import QCoreApplication, QObject, QTranslator
 
-from EricWidgets.EricApplication import ericApp
-
-import Preferences
-
-from Globals import isWindowsPlatform, isMacPlatform
+from eric7 import Preferences
+from eric7.EricWidgets.EricApplication import ericApp
+from eric7.Globals import isWindowsPlatform, isMacPlatform
 
 from ProjectDjango.Project import Project
 
@@ -26,7 +24,7 @@
 author = "Detlev Offenbach <detlev@die-offenbachs.de>"
 autoactivate = True
 deactivateable = True
-version = "10.0.1"
+version = "10.1.0"
 className = "ProjectDjangoPlugin"
 packageName = "ProjectDjango"
 shortDescription = "Project support for Django projects."
@@ -199,7 +197,7 @@
                 progLanguages=self.__supportedVariants[:],
             )
 
-        from Project.ProjectBrowser import (
+        from eric7.Project.ProjectBrowser import (
             SourcesBrowserFlag,
             FormsBrowserFlag,
             TranslationsBrowserFlag,

Binary file PluginProjectDjango.zip has changed

--- a/ProjectDjango/ConfigurationPage/DjangoPage.py	Wed Sep 21 16:42:20 2022 +0200
+++ b/ProjectDjango/ConfigurationPage/DjangoPage.py	Tue Oct 25 10:37:21 2022 +0200
@@ -7,14 +7,15 @@
 Module implementing the Django configuration page.
 """
 
-from EricWidgets.EricApplication import ericApp
-from EricWidgets.EricPathPicker import EricPathPickerModes
+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,
+)
 
-from Preferences.ConfigurationPages.ConfigurationPageBase import ConfigurationPageBase
 from .Ui_DjangoPage import Ui_DjangoPage
 
-from Globals import isWindowsPlatform, isMacPlatform
-
 
 class DjangoPage(ConfigurationPageBase, Ui_DjangoPage):
     """

--- a/ProjectDjango/ConfigurationPage/DjangoPage.ui	Wed Sep 21 16:42:20 2022 +0200
+++ b/ProjectDjango/ConfigurationPage/DjangoPage.ui	Tue Oct 25 10:37:21 2022 +0200
@@ -347,7 +347,7 @@
   <customwidget>
    <class>EricPathPicker</class>
    <extends>QWidget</extends>
-   <header>EricWidgets/EricPathPicker.h</header>
+   <header>eric7/EricWidgets/EricPathPicker.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>

--- a/ProjectDjango/DjangoCheckOptionsDialog.py	Wed Sep 21 16:42:20 2022 +0200
+++ b/ProjectDjango/DjangoCheckOptionsDialog.py	Tue Oct 25 10:37:21 2022 +0200
@@ -12,14 +12,16 @@
 from PyQt6.QtCore import pyqtSlot, Qt, QProcess
 from PyQt6.QtWidgets import QDialog
 
-from EricWidgets import EricFileDialog
+from eric7 import Preferences, Utilities
+
+try:
+    from eric7.EricGui import EricPixmapCache
+except ImportError:
+    from UI import PixmapCache as EricPixmapCache
+from eric7.EricWidgets import EricFileDialog
 
 from .Ui_DjangoCheckOptionsDialog import Ui_DjangoCheckOptionsDialog
 
-import Preferences
-import Utilities
-import UI.PixmapCache
-
 
 class DjangoCheckOptionsDialog(QDialog, Ui_DjangoCheckOptionsDialog):
     """
@@ -44,7 +46,7 @@
         super().__init__(parent)
         self.setupUi(self)
 
-        self.settingsFileButton.setIcon(UI.PixmapCache.getIcon("open"))
+        self.settingsFileButton.setIcon(EricPixmapCache.getIcon("open"))
 
         self.__python = python
         self.__path = path

--- a/ProjectDjango/DjangoDialog.py	Wed Sep 21 16:42:20 2022 +0200
+++ b/ProjectDjango/DjangoDialog.py	Tue Oct 25 10:37:21 2022 +0200
@@ -18,14 +18,12 @@
     QLineEdit,
 )
 
-from EricWidgets import EricMessageBox, EricFileDialog
+from eric7 import Preferences
+from eric7.EricWidgets import EricMessageBox, EricFileDialog
+from eric7.Globals import isWindowsPlatform, strToQByteArray
 
 from .Ui_DjangoDialog import Ui_DjangoDialog
 
-import Preferences
-
-from Globals import isWindowsPlatform, strToQByteArray
-
 
 class DjangoDialog(QDialog, Ui_DjangoDialog):
     """

--- a/ProjectDjango/DjangoLoaddataDataDialog.py	Wed Sep 21 16:42:20 2022 +0200
+++ b/ProjectDjango/DjangoLoaddataDataDialog.py	Tue Oct 25 10:37:21 2022 +0200
@@ -12,13 +12,16 @@
 from PyQt6.QtCore import pyqtSlot
 from PyQt6.QtWidgets import QDialog, QDialogButtonBox
 
-from EricWidgets import EricFileDialog
+from eric7 import Utilities
+
+try:
+    from eric7.EricGui import EricPixmapCache
+except ImportError:
+    from UI import PixmapCache as EricPixmapCache
+from eric7.EricWidgets import EricFileDialog
 
 from .Ui_DjangoLoaddataDataDialog import Ui_DjangoLoaddataDataDialog
 
-import Utilities
-import UI.PixmapCache
-
 
 class DjangoLoaddataDataDialog(QDialog, Ui_DjangoLoaddataDataDialog):
     """
@@ -37,7 +40,7 @@
         super().__init__(parent)
         self.setupUi(self)
 
-        self.fixtureFileButton.setIcon(UI.PixmapCache.getIcon("open"))
+        self.fixtureFileButton.setIcon(EricPixmapCache.getIcon("open"))
 
         self.__project = project
 

--- a/ProjectDjango/DjangoMigrationsListDialog.py	Wed Sep 21 16:42:20 2022 +0200
+++ b/ProjectDjango/DjangoMigrationsListDialog.py	Tue Oct 25 10:37:21 2022 +0200
@@ -20,12 +20,11 @@
     QLineEdit,
 )
 
-from EricWidgets import EricMessageBox
+from eric7 import Preferences
+from eric7.EricWidgets import EricMessageBox
 
 from .Ui_DjangoMigrationsListDialog import Ui_DjangoMigrationsListDialog
 
-import Preferences
-
 
 class DjangoMigrationsListDialog(QDialog, Ui_DjangoMigrationsListDialog):
     """

--- a/ProjectDjango/DjangoRunTestServerDataDialog.py	Wed Sep 21 16:42:20 2022 +0200
+++ b/ProjectDjango/DjangoRunTestServerDataDialog.py	Tue Oct 25 10:37:21 2022 +0200
@@ -12,12 +12,14 @@
 from PyQt6.QtCore import pyqtSlot
 from PyQt6.QtWidgets import QDialog, QDialogButtonBox
 
-from EricWidgets.EricPathPicker import EricPathPickerModes
+try:
+    from eric7.EricGui import EricPixmapCache
+except ImportError:
+    from UI import PixmapCache as EricPixmapCache
+from eric7.EricWidgets.EricPathPicker import EricPathPickerModes
 
 from .Ui_DjangoRunTestServerDataDialog import Ui_DjangoRunTestServerDataDialog
 
-import UI.PixmapCache
-
 
 class DjangoRunTestServerDataDialog(QDialog, Ui_DjangoRunTestServerDataDialog):
     """
@@ -46,7 +48,7 @@
         self.fixturePicker.setMode(EricPathPickerModes.OPEN_FILE_MODE)
         self.fixturePicker.setFilters(fileFilters)
 
-        self.fixtureFileButton.setIcon(UI.PixmapCache.getIcon("open"))
+        self.fixtureFileButton.setIcon(EricPixmapCache.getIcon("open"))
 
         self.__project = project
 

--- a/ProjectDjango/DjangoRunTestServerDataDialog.ui	Wed Sep 21 16:42:20 2022 +0200
+++ b/ProjectDjango/DjangoRunTestServerDataDialog.ui	Tue Oct 25 10:37:21 2022 +0200
@@ -53,7 +53,7 @@
   <customwidget>
    <class>EricPathPicker</class>
    <extends>QWidget</extends>
-   <header>EricWidgets/EricPathPicker.h</header>
+   <header>eric7/EricWidgets/EricPathPicker.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>