Mercurial Repositories > Pyramid Project / changeset
changeset
Adapted the import statements to the new structure.
Tue, 25 Oct 2022 09:40:12 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Tue, 25 Oct 2022 09:40:12 +0200
- branch
- eric7
- changeset 160
- 41b23683d5a1
- parent 159
- d4e7f5a389e6
- child 161
- fc547354ca23
Adapted the import statements to the new structure.
--- a/ChangeLog Wed Sep 21 16:24:54 2022 +0200 +++ b/ChangeLog Tue Oct 25 09:40:12 2022 +0200 @@ -1,5 +1,8 @@ ChangeLog --------- +Version 10.1.0 +- adapted the import statements to the new structure + Version 10.0.1: - bug fixes
--- a/PluginProjectPyramid.py Wed Sep 21 16:24:54 2022 +0200 +++ b/PluginProjectPyramid.py Tue Oct 25 09:40:12 2022 +0200 @@ -13,11 +13,9 @@ 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 ProjectPyramid.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 = "ProjectPyramidPlugin" packageName = "ProjectPyramid" shortDescription = "Project support for Pyramid projects." @@ -189,7 +187,7 @@ progLanguages=self.__supportedVariants[:], ) - from Project.ProjectBrowser import ( + from eric7.Project.ProjectBrowser import ( SourcesBrowserFlag, FormsBrowserFlag, TranslationsBrowserFlag,
--- a/PluginPyramid.epj Wed Sep 21 16:24:54 2022 +0200 +++ b/PluginPyramid.epj Tue Oct 25 09:40:12 2022 +0200 @@ -244,7 +244,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, @@ -304,6 +304,7 @@ "ProjectPyramid/i18n/pyramid_ru.ts" ], "TRANSLATIONSBINPATH": "", + "TRANSLATIONSOURCESTARTPATH": "", "UICPARAMS": { "Package": "", "PackagesRoot": "",
--- a/ProjectPyramid/ConfigurationPage/PyramidPage.py Wed Sep 21 16:24:54 2022 +0200 +++ b/ProjectPyramid/ConfigurationPage/PyramidPage.py Tue Oct 25 09:40:12 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_PyramidPage import Ui_PyramidPage -import UI.PixmapCache - -from Globals import isWindowsPlatform, isMacPlatform - class PyramidPage(ConfigurationPageBase, Ui_PyramidPage): """ @@ -53,7 +56,7 @@ consoleList.append("xterm -e") self.consoleCommandCombo.addItems(consoleList) - self.urlResetButton.setIcon(UI.PixmapCache.getIcon("editUndo")) + self.urlResetButton.setIcon(EricPixmapCache.getIcon("editUndo")) self.py3ShellCombo.addItem(self.tr("Plain Python"), "python") self.py3ShellCombo.addItem(self.tr("IPython"), "ipython")
--- a/ProjectPyramid/ConfigurationPage/PyramidPage.ui Wed Sep 21 16:24:54 2022 +0200 +++ b/ProjectPyramid/ConfigurationPage/PyramidPage.ui Tue Oct 25 09:40:12 2022 +0200 @@ -237,7 +237,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/ProjectPyramid/DistributionTypeSelectionDialog.py Wed Sep 21 16:24:54 2022 +0200 +++ b/ProjectPyramid/DistributionTypeSelectionDialog.py Tue Oct 25 09:40:12 2022 +0200 @@ -10,12 +10,11 @@ from PyQt6.QtCore import Qt, QProcess from PyQt6.QtWidgets import QDialog, QListWidgetItem -from EricWidgets import EricMessageBox +from eric7 import Preferences +from eric7.EricWidgets import EricMessageBox from .Ui_DistributionTypeSelectionDialog import Ui_DistributionTypeSelectionDialog -import Preferences - class DistributionTypeSelectionDialog(QDialog, Ui_DistributionTypeSelectionDialog): """
--- a/ProjectPyramid/MigrateSummaryDialog.py Wed Sep 21 16:24:54 2022 +0200 +++ b/ProjectPyramid/MigrateSummaryDialog.py Tue Oct 25 09:40:12 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/ProjectPyramid/Project.py Wed Sep 21 16:24:54 2022 +0200 +++ b/ProjectPyramid/Project.py Tue Oct 25 09:40:12 2022 +0200 @@ -20,17 +20,19 @@ from PyQt6.QtWidgets import QMenu, QDialog, QInputDialog, QLineEdit from PyQt6.QtCore import QProcess as QProcessPyQt -from EricWidgets.EricApplication import ericApp -from EricWidgets import EricMessageBox, EricFileDialog -from EricGui.EricAction import EricAction +from eric7 import Preferences, Utilities +from eric7.EricGui.EricAction import EricAction +from eric7.EricWidgets.EricApplication import ericApp +from eric7.EricWidgets import EricMessageBox, EricFileDialog +from eric7.Globals import isWindowsPlatform + +try: + from eric7.EricGui import EricPixmapCache +except ImportError: + from UI import PixmapCache as EricPixmapCache from .PyramidDialog import PyramidDialog -import Preferences -import Utilities -from Globals import isWindowsPlatform -import UI.PixmapCache - class PyramidNoProjectSelectedError(Exception): """ @@ -1045,7 +1047,7 @@ buttons=EricMessageBox.Ok, ) msgBox.setIconPixmap( - UI.PixmapCache.getPixmap( + EricPixmapCache.getPixmap( os.path.join( "ProjectPyramid", "icons", "pyramid64-{0}".format(self.__iconSuffix) )
--- a/ProjectPyramid/PyramidDialog.py Wed Sep 21 16:24:54 2022 +0200 +++ b/ProjectPyramid/PyramidDialog.py Tue Oct 25 09:40:12 2022 +0200 @@ -12,13 +12,12 @@ from PyQt6.QtCore import QProcess, QTimer, pyqtSlot, Qt, QCoreApplication from PyQt6.QtWidgets import QDialog, QDialogButtonBox, QLineEdit, QTextEdit -from EricWidgets import EricMessageBox +from eric7 import Preferences +from eric7.EricWidgets import EricMessageBox +from eric7.Globals import isWindowsPlatform, isMacPlatform, strToQByteArray from .Ui_PyramidDialog import Ui_PyramidDialog -import Preferences -from Globals import isWindowsPlatform, isMacPlatform, strToQByteArray - class PyramidDialog(QDialog, Ui_PyramidDialog): """
--- a/ProjectPyramid/PyramidRoutesDialog.py Wed Sep 21 16:24:54 2022 +0200 +++ b/ProjectPyramid/PyramidRoutesDialog.py Tue Oct 25 09:40:12 2022 +0200 @@ -12,13 +12,12 @@ from PyQt6.QtCore import pyqtSlot, Qt, QProcess, QTimer, QCoreApplication from PyQt6.QtWidgets import QDialog, QDialogButtonBox, QLineEdit, QTreeWidgetItem -from EricWidgets import EricMessageBox +from eric7 import Preferences +from eric7.EricWidgets import EricMessageBox +from eric7.Globals import strToQByteArray from .Ui_PyramidRoutesDialog import Ui_PyramidRoutesDialog -import Preferences -from Globals import strToQByteArray - class PyramidRoutesDialog(QDialog, Ui_PyramidRoutesDialog): """
