Mercurial Repositories > Flask Project / changeset
changeset
Adapted the import statements to the new structure.
Tue, 25 Oct 2022 10:07:29 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Tue, 25 Oct 2022 10:07:29 +0200
- branch
- eric7
- changeset 72
- 4557829a4acf
- parent 71
- 3ceae1dcbffa
- child 73
- a4ba4554e100
Adapted the import statements to the new structure.
--- a/ChangeLog Wed Sep 21 16:30:55 2022 +0200 +++ b/ChangeLog Tue Oct 25 10:07:29 2022 +0200 @@ -1,5 +1,8 @@ ChangeLog --------- +Version 10.1.0 +- adapted the import statements to the new structure + Version 10.0.0: - first release of the eric7 variant
--- a/PluginProjectFlask.py Wed Sep 21 16:30:55 2022 +0200 +++ b/PluginProjectFlask.py Tue Oct 25 10:07:29 2022 +0200 @@ -13,11 +13,10 @@ from PyQt6.QtCore import QCoreApplication, QObject, QTranslator -from EricWidgets.EricApplication import ericApp +from eric7 import Preferences +from eric7.EricWidgets.EricApplication import ericApp +from eric7.Globals import isWindowsPlatform, isMacPlatform -import Preferences - -from Globals import isWindowsPlatform, isMacPlatform from ProjectFlask.Project import Project @@ -26,7 +25,7 @@ author = "Detlev Offenbach <detlev@die-offenbachs.de>" autoactivate = True deactivateable = True -version = "10.0.0" +version = "10.1.0" className = "ProjectFlaskPlugin" packageName = "ProjectFlask" shortDescription = "Project support for Flask projects." @@ -190,7 +189,7 @@ progLanguages=self.__supportedVariants[:], ) - from Project.ProjectBrowser import ( + from eric7.Project.ProjectBrowser import ( SourcesBrowserFlag, FormsBrowserFlag, TranslationsBrowserFlag,
--- a/ProjectFlask/ConfigurationPage/FlaskPage.py Wed Sep 21 16:30:55 2022 +0200 +++ b/ProjectFlask/ConfigurationPage/FlaskPage.py Tue Oct 25 10:07:29 2022 +0200 @@ -9,16 +9,19 @@ from PyQt6.QtCore import pyqtSlot -from EricWidgets.EricApplication import ericApp -from EricWidgets.EricPathPicker import EricPathPickerModes +try: + from eric7.EricGui import EricPixmapCache +except ImportError: + from UI import PixmapCache as EricPixmapCache +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_FlaskPage import Ui_FlaskPage -import UI.PixmapCache - -from Globals import isWindowsPlatform, isMacPlatform - from .. import AnsiTools @@ -56,8 +59,8 @@ self.colorSchemeComboBox.addItems(sorted(AnsiTools.getAvailableColorSchemes())) - self.urlResetButton.setIcon(UI.PixmapCache.getIcon("editUndo")) - self.py3VenvNamesReloadButton.setIcon(UI.PixmapCache.getIcon("reload")) + self.urlResetButton.setIcon(EricPixmapCache.getIcon("editUndo")) + self.py3VenvNamesReloadButton.setIcon(EricPixmapCache.getIcon("reload")) venvManager = ericApp().getObject("VirtualEnvManager") self.py3VenvNameComboBox.addItems(
--- a/ProjectFlask/ConfigurationPage/FlaskPage.ui Wed Sep 21 16:30:55 2022 +0200 +++ b/ProjectFlask/ConfigurationPage/FlaskPage.ui Tue Oct 25 10:07:29 2022 +0200 @@ -234,7 +234,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/ProjectFlask/FlaskBabelExtension/PyBabelCommandDialog.py Wed Sep 21 16:30:55 2022 +0200 +++ b/ProjectFlask/FlaskBabelExtension/PyBabelCommandDialog.py Tue Oct 25 10:07:29 2022 +0200 @@ -10,7 +10,7 @@ from PyQt6.QtCore import pyqtSlot, Qt, QProcess, QTimer from PyQt6.QtWidgets import QDialog, QDialogButtonBox, QAbstractButton -from EricWidgets import EricMessageBox +from eric7.EricWidgets import EricMessageBox from ..Ui_FlaskCommandDialog import Ui_FlaskCommandDialog
--- a/ProjectFlask/FlaskBabelExtension/PyBabelConfigDialog.py Wed Sep 21 16:30:55 2022 +0200 +++ b/ProjectFlask/FlaskBabelExtension/PyBabelConfigDialog.py Tue Oct 25 10:07:29 2022 +0200 @@ -12,8 +12,8 @@ from PyQt6.QtCore import pyqtSlot, Qt from PyQt6.QtWidgets import QDialog, QDialogButtonBox -from EricWidgets.EricPathPicker import EricPathPickerModes -from EricWidgets.EricApplication import ericApp +from eric7.EricWidgets.EricApplication import ericApp +from eric7.EricWidgets.EricPathPicker import EricPathPickerModes from .Ui_PyBabelConfigDialog import Ui_PyBabelConfigDialog
--- a/ProjectFlask/FlaskBabelExtension/PyBabelConfigDialog.ui Wed Sep 21 16:30:55 2022 +0200 +++ b/ProjectFlask/FlaskBabelExtension/PyBabelConfigDialog.ui Tue Oct 25 10:07:29 2022 +0200 @@ -136,7 +136,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/ProjectFlask/FlaskBabelExtension/PyBabelProjectExtension.py Wed Sep 21 16:30:55 2022 +0200 +++ b/ProjectFlask/FlaskBabelExtension/PyBabelProjectExtension.py Tue Oct 25 10:07:29 2022 +0200 @@ -7,21 +7,20 @@ Module implementing the project support for flask-babel. """ +import contextlib import os import re -import contextlib from PyQt6.QtCore import pyqtSlot, QObject, QProcess from PyQt6.QtWidgets import QDialog, QMenu -from EricWidgets import EricMessageBox -from EricWidgets.EricApplication import ericApp -from EricGui.EricAction import EricAction +from eric7 import Utilities +from eric7.EricGui.EricAction import EricAction +from eric7.EricWidgets import EricMessageBox +from eric7.EricWidgets.EricApplication import ericApp from .PyBabelCommandDialog import PyBabelCommandDialog -import Utilities - class PyBabelProject(QObject): """
--- a/ProjectFlask/FlaskCommandDialog.py Wed Sep 21 16:30:55 2022 +0200 +++ b/ProjectFlask/FlaskCommandDialog.py Tue Oct 25 10:07:29 2022 +0200 @@ -10,7 +10,7 @@ from PyQt6.QtCore import pyqtSlot, Qt, QProcess, QTimer from PyQt6.QtWidgets import QDialog, QDialogButtonBox, QAbstractButton -from EricWidgets import EricMessageBox +from eric7.EricWidgets import EricMessageBox from .Ui_FlaskCommandDialog import Ui_FlaskCommandDialog
--- a/ProjectFlask/FlaskConfigDialog.py Wed Sep 21 16:30:55 2022 +0200 +++ b/ProjectFlask/FlaskConfigDialog.py Tue Oct 25 10:07:29 2022 +0200 @@ -10,13 +10,16 @@ from PyQt6.QtCore import pyqtSlot from PyQt6.QtWidgets import QDialog -from EricWidgets.EricApplication import ericApp +from eric7 import Preferences +from eric7.EricWidgets.EricApplication import ericApp + +try: + from eric7.EricGui import EricPixmapCache +except ImportError: + from UI import PixmapCache as EricPixmapCache from .Ui_FlaskConfigDialog import Ui_FlaskConfigDialog -import UI.PixmapCache -import Preferences - class FlaskConfigDialog(QDialog, Ui_FlaskConfigDialog): """ @@ -37,7 +40,7 @@ super().__init__(parent) self.setupUi(self) - self.newEnvironmentButton.setIcon(UI.PixmapCache.getIcon("virtualenvConfig")) + self.newEnvironmentButton.setIcon(EricPixmapCache.getIcon("virtualenvConfig")) self.__project = project
--- a/ProjectFlask/FlaskMigrateExtension/MigrateConfigDialog.py Wed Sep 21 16:30:55 2022 +0200 +++ b/ProjectFlask/FlaskMigrateExtension/MigrateConfigDialog.py Tue Oct 25 10:07:29 2022 +0200 @@ -10,8 +10,8 @@ from PyQt6.QtCore import Qt from PyQt6.QtWidgets import QDialog -from EricWidgets.EricPathPicker import EricPathPickerModes -from EricWidgets.EricApplication import ericApp +from eric7.EricWidgets.EricApplication import ericApp +from eric7.EricWidgets.EricPathPicker import EricPathPickerModes from .Ui_MigrateConfigDialog import Ui_MigrateConfigDialog
--- a/ProjectFlask/FlaskMigrateExtension/MigrateConfigDialog.ui Wed Sep 21 16:30:55 2022 +0200 +++ b/ProjectFlask/FlaskMigrateExtension/MigrateConfigDialog.ui Tue Oct 25 10:07:29 2022 +0200 @@ -68,7 +68,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/ProjectFlask/FlaskMigrateExtension/MigrateProjectExtension.py Wed Sep 21 16:30:55 2022 +0200 +++ b/ProjectFlask/FlaskMigrateExtension/MigrateProjectExtension.py Tue Oct 25 10:07:29 2022 +0200 @@ -13,11 +13,10 @@ from PyQt6.QtCore import pyqtSlot, QObject, QProcess from PyQt6.QtWidgets import QMenu, QDialog, QInputDialog, QLineEdit -from EricWidgets import EricMessageBox -from EricWidgets.EricApplication import ericApp -from EricGui.EricAction import EricAction - -import Utilities +from eric7 import Utilities +from eric7.EricGui.EricAction import EricAction +from eric7.EricWidgets import EricMessageBox +from eric7.EricWidgets.EricApplication import ericApp from ..FlaskCommandDialog import FlaskCommandDialog @@ -170,7 +169,7 @@ self.actions.append(self.migrateCreateAct) ######################################################### - ## action to up- and downgrade a databse + ## action to up- and downgrade a database ######################################################### self.upgradeDatabaseAct = EricAction(
--- a/ProjectFlask/FlaskMigrateExtension/MigrateSummaryDialog.py Wed Sep 21 16:30:55 2022 +0200 +++ b/ProjectFlask/FlaskMigrateExtension/MigrateSummaryDialog.py Tue Oct 25 10:07:29 2022 +0200 @@ -17,8 +17,8 @@ QAbstractItemView, ) -from EricGui.EricOverrideCursor import EricOverrideCursor, EricOverridenCursor -from EricWidgets import EricMessageBox +from eric7.EricGui.EricOverrideCursor import EricOverrideCursor, EricOverridenCursor +from eric7.EricWidgets import EricMessageBox from .Ui_MigrateSummaryDialog import Ui_MigrateSummaryDialog
--- a/ProjectFlask/FlaskVirtualenvConfigurationDialog.py Wed Sep 21 16:30:55 2022 +0200 +++ b/ProjectFlask/FlaskVirtualenvConfigurationDialog.py Tue Oct 25 10:07:29 2022 +0200 @@ -8,18 +8,17 @@ environment. """ +import os import sys -import os from PyQt6.QtCore import pyqtSlot from PyQt6.QtWidgets import QDialog, QDialogButtonBox -from EricWidgets.EricPathPicker import EricPathPickerModes +from eric7 import Utilities +from eric7.EricWidgets.EricPathPicker import EricPathPickerModes from .Ui_FlaskVirtualenvConfigurationDialog import Ui_FlaskVirtualenvConfigurationDialog -import Utilities - class FlaskVirtualenvConfigurationDialog( QDialog, Ui_FlaskVirtualenvConfigurationDialog
--- a/ProjectFlask/FlaskVirtualenvConfigurationDialog.ui Wed Sep 21 16:30:55 2022 +0200 +++ b/ProjectFlask/FlaskVirtualenvConfigurationDialog.ui Tue Oct 25 10:07:29 2022 +0200 @@ -103,7 +103,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/ProjectFlask/Project.py Wed Sep 21 16:30:55 2022 +0200 +++ b/ProjectFlask/Project.py Tue Oct 25 10:07:29 2022 +0200 @@ -19,14 +19,16 @@ ) from PyQt6.QtWidgets import QMenu, QDialog -from EricWidgets import EricMessageBox, EricFileDialog -from EricGui.EricAction import EricAction -from EricWidgets.EricApplication import ericApp +from eric7 import Utilities +from eric7.EricGui.EricAction import EricAction +from eric7.EricWidgets import EricMessageBox, EricFileDialog +from eric7.EricWidgets.EricApplication import ericApp +from eric7.Globals import isWindowsPlatform -from Globals import isWindowsPlatform - -import UI.PixmapCache -import Utilities +try: + from eric7.EricGui import EricPixmapCache +except ImportError: + from UI import PixmapCache as EricPixmapCache from .FlaskBabelExtension.PyBabelProjectExtension import PyBabelProject from .FlaskMigrateExtension.MigrateProjectExtension import MigrateProject @@ -590,7 +592,7 @@ buttons=EricMessageBox.Ok, ) msgBox.setIconPixmap( - UI.PixmapCache.getPixmap( + EricPixmapCache.getPixmap( os.path.join( "ProjectFlask", "icons", "flask64-{0}".format(self.__iconSuffix) )
--- a/ProjectFlask/RoutesDialog.py Wed Sep 21 16:30:55 2022 +0200 +++ b/ProjectFlask/RoutesDialog.py Tue Oct 25 10:07:29 2022 +0200 @@ -10,8 +10,8 @@ from PyQt6.QtCore import pyqtSlot, QProcess from PyQt6.QtWidgets import QDialog, QDialogButtonBox, QTreeWidgetItem -from EricGui.EricOverrideCursor import EricOverrideCursor, EricOverridenCursor -from EricWidgets import EricMessageBox +from eric7.EricGui.EricOverrideCursor import EricOverrideCursor, EricOverridenCursor +from eric7.EricWidgets import EricMessageBox from .Ui_RoutesDialog import Ui_RoutesDialog
--- a/ProjectFlask/RunServerDialog.py Wed Sep 21 16:30:55 2022 +0200 +++ b/ProjectFlask/RunServerDialog.py Tue Oct 25 10:07:29 2022 +0200 @@ -13,16 +13,18 @@ from PyQt6.QtGui import QTextCharFormat from PyQt6.QtWidgets import QDialog, QDialogButtonBox, QMenu -from EricWidgets import EricMessageBox -from EricWidgets.EricApplication import ericApp +try: + from eric7.EricGui import EricPixmapCache +except ImportError: + from UI import PixmapCache as EricPixmapCache +from eric7.EricWidgets import EricMessageBox +from eric7.EricWidgets.EricApplication import ericApp from .Ui_RunServerDialog import Ui_RunServerDialog from . import AnsiTools from .ServerStartOptionsDialog import ServerStartOptionsDialog -import UI.PixmapCache - # TODO: should this be placed into the sidebar as a sidebar widget? class RunServerDialog(QDialog, Ui_RunServerDialog): @@ -83,7 +85,7 @@ self.tr("Re-start Server with Options"), self.__restartServerWithOptions ) - self.menuButton.setIcon(UI.PixmapCache.getIcon("actionsToolButton")) + self.menuButton.setIcon(EricPixmapCache.getIcon("actionsToolButton")) self.menuButton.setMenu(self.__actionsMenu) @pyqtSlot()
--- a/ProjectFlask/ServerStartOptionsDialog.py Wed Sep 21 16:30:55 2022 +0200 +++ b/ProjectFlask/ServerStartOptionsDialog.py Tue Oct 25 10:07:29 2022 +0200 @@ -9,8 +9,8 @@ from PyQt6.QtWidgets import QDialog -from EricWidgets.EricPathPicker import EricPathPickerModes -from EricWidgets.EricApplication import ericApp +from eric7.EricWidgets.EricApplication import ericApp +from eric7.EricWidgets.EricPathPicker import EricPathPickerModes from .Ui_ServerStartOptionsDialog import Ui_ServerStartOptionsDialog
--- a/ProjectFlask/ServerStartOptionsDialog.ui Wed Sep 21 16:30:55 2022 +0200 +++ b/ProjectFlask/ServerStartOptionsDialog.ui Tue Oct 25 10:07:29 2022 +0200 @@ -142,7 +142,7 @@ <customwidget> <class>EricPathPicker</class> <extends>QWidget</extends> - <header>EricWidgets/EricPathPicker.h</header> + <header>eric7/EricWidgets/EricPathPicker.h</header> <container>1</container> </customwidget> </customwidgets>
