Mercurial Repositories > Flask Project / changeset
changeset
Resorted the import statements with isort.
Wed, 16 Nov 2022 09:41:50 +0100
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Wed, 16 Nov 2022 09:41:50 +0100
- branch
- eric7
- changeset 75
- 7a30d96ea9f6
- parent 74
- 5dacf5caf3a3
- child 76
- 83f6ca684564
Resorted the import statements with isort.
--- a/PluginFlask.epj Wed Nov 16 09:37:57 2022 +0100 +++ b/PluginFlask.epj Wed Nov 16 09:41:50 2022 +0100 @@ -202,11 +202,12 @@ "ProjectFlask/icons/flask-dark.svg", "ProjectFlask/icons/flask-light.svg", "ProjectFlask/icons/flask64-dark.svg", - "ProjectFlask/icons/flask64-light.svg" + "ProjectFlask/icons/flask64-light.svg", + "pyproject.toml" ], "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, @@ -220,6 +221,22 @@ "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": [ + "pxd", + "py", + "pyx", + "pyi" + ] } }, "PACKAGERSPARMS": {}, @@ -278,6 +295,7 @@ "ProjectFlask/i18n/flask_ru.ts" ], "TRANSLATIONSBINPATH": "", + "TRANSLATIONSOURCESTARTPATH": "", "UICPARAMS": { "Package": "", "PackagesRoot": "",
--- a/PluginProjectFlask.py Wed Nov 16 09:37:57 2022 +0100 +++ b/PluginProjectFlask.py Wed Nov 16 09:41:50 2022 +0100 @@ -7,17 +7,15 @@ Module implementing the Flask project plugin. """ -import os +import fnmatch import glob -import fnmatch +import os from PyQt6.QtCore import QCoreApplication, QObject, QTranslator from eric7 import Preferences from eric7.EricWidgets.EricApplication import ericApp -from eric7.Globals import isWindowsPlatform, isMacPlatform - - +from eric7.Globals import isMacPlatform, isWindowsPlatform from ProjectFlask.Project import Project # Start-of-Header @@ -190,10 +188,10 @@ ) from eric7.Project.ProjectBrowser import ( + FormsBrowserFlag, + OthersBrowserFlag, SourcesBrowserFlag, - FormsBrowserFlag, TranslationsBrowserFlag, - OthersBrowserFlag, ) Preferences.setProjectBrowserFlagsDefault(
--- a/ProjectFlask/AnsiTools.py Wed Nov 16 09:37:57 2022 +0100 +++ b/ProjectFlask/AnsiTools.py Wed Nov 16 09:41:50 2022 +0100 @@ -7,7 +7,7 @@ Module implementing functions to work with ANSI escape sequences for colors. """ -from PyQt6.QtGui import QColor, QBrush +from PyQt6.QtGui import QBrush, QColor # ANSI Colors (see https://en.wikipedia.org/wiki/ANSI_escape_code) _AnsiColorSchemes = {
--- a/ProjectFlask/ConfigurationPage/FlaskPage.py Wed Nov 16 09:37:57 2022 +0100 +++ b/ProjectFlask/ConfigurationPage/FlaskPage.py Wed Nov 16 09:41:50 2022 +0100 @@ -13,17 +13,17 @@ 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.Globals import isMacPlatform, isWindowsPlatform from eric7.Preferences.ConfigurationPages.ConfigurationPageBase import ( ConfigurationPageBase, ) +from .. import AnsiTools from .Ui_FlaskPage import Ui_FlaskPage -from .. import AnsiTools - class FlaskPage(ConfigurationPageBase, Ui_FlaskPage): """
--- a/ProjectFlask/FlaskBabelExtension/PyBabelCommandDialog.py Wed Nov 16 09:37:57 2022 +0100 +++ b/ProjectFlask/FlaskBabelExtension/PyBabelCommandDialog.py Wed Nov 16 09:41:50 2022 +0100 @@ -7,8 +7,8 @@ Module implementing a dialog to run a flask command and show its output. """ -from PyQt6.QtCore import pyqtSlot, Qt, QProcess, QTimer -from PyQt6.QtWidgets import QDialog, QDialogButtonBox, QAbstractButton +from PyQt6.QtCore import QProcess, Qt, QTimer, pyqtSlot +from PyQt6.QtWidgets import QAbstractButton, QDialog, QDialogButtonBox from eric7.EricWidgets import EricMessageBox
--- a/ProjectFlask/FlaskBabelExtension/PyBabelConfigDialog.py Wed Nov 16 09:37:57 2022 +0100 +++ b/ProjectFlask/FlaskBabelExtension/PyBabelConfigDialog.py Wed Nov 16 09:41:50 2022 +0100 @@ -9,7 +9,7 @@ import os -from PyQt6.QtCore import pyqtSlot, Qt +from PyQt6.QtCore import Qt, pyqtSlot from PyQt6.QtWidgets import QDialog, QDialogButtonBox from eric7.EricWidgets.EricApplication import ericApp
--- a/ProjectFlask/FlaskBabelExtension/PyBabelProjectExtension.py Wed Nov 16 09:37:57 2022 +0100 +++ b/ProjectFlask/FlaskBabelExtension/PyBabelProjectExtension.py Wed Nov 16 09:41:50 2022 +0100 @@ -11,7 +11,7 @@ import os import re -from PyQt6.QtCore import pyqtSlot, QObject, QProcess +from PyQt6.QtCore import QObject, QProcess, pyqtSlot from PyQt6.QtWidgets import QDialog, QMenu from eric7 import Utilities
--- a/ProjectFlask/FlaskCommandDialog.py Wed Nov 16 09:37:57 2022 +0100 +++ b/ProjectFlask/FlaskCommandDialog.py Wed Nov 16 09:41:50 2022 +0100 @@ -7,8 +7,8 @@ Module implementing a dialog to run a flask command and show its output. """ -from PyQt6.QtCore import pyqtSlot, Qt, QProcess, QTimer -from PyQt6.QtWidgets import QDialog, QDialogButtonBox, QAbstractButton +from PyQt6.QtCore import QProcess, Qt, QTimer, pyqtSlot +from PyQt6.QtWidgets import QAbstractButton, QDialog, QDialogButtonBox from eric7.EricWidgets import EricMessageBox
--- a/ProjectFlask/FlaskMigrateExtension/MigrateProjectExtension.py Wed Nov 16 09:37:57 2022 +0100 +++ b/ProjectFlask/FlaskMigrateExtension/MigrateProjectExtension.py Wed Nov 16 09:41:50 2022 +0100 @@ -7,11 +7,11 @@ Module implementing the project support for flask-migrate. """ +import glob import os -import glob -from PyQt6.QtCore import pyqtSlot, QObject, QProcess -from PyQt6.QtWidgets import QMenu, QDialog, QInputDialog, QLineEdit +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
--- a/ProjectFlask/FlaskMigrateExtension/MigrateSummaryDialog.py Wed Nov 16 09:37:57 2022 +0100 +++ b/ProjectFlask/FlaskMigrateExtension/MigrateSummaryDialog.py Wed Nov 16 09:41:50 2022 +0100 @@ -7,14 +7,14 @@ Module implementing a dialog showing a summary of all created.migrations. """ -from PyQt6.QtCore import pyqtSlot, Qt, QProcess, QEventLoop, QTimer +from PyQt6.QtCore import QEventLoop, QProcess, Qt, QTimer, pyqtSlot from PyQt6.QtGui import QGuiApplication from PyQt6.QtWidgets import ( + QAbstractButton, + QAbstractItemView, QDialog, QDialogButtonBox, - QAbstractButton, QTreeWidgetItem, - QAbstractItemView, ) from eric7.EricGui.EricOverrideCursor import EricOverrideCursor, EricOverridenCursor
--- a/ProjectFlask/FormSelectionDialog.py Wed Nov 16 09:37:57 2022 +0100 +++ b/ProjectFlask/FormSelectionDialog.py Wed Nov 16 09:41:50 2022 +0100 @@ -7,7 +7,7 @@ Module implementing a dialog to select the template type. """ -from PyQt6.QtCore import pyqtSlot, QCoreApplication +from PyQt6.QtCore import QCoreApplication, pyqtSlot from PyQt6.QtWidgets import QDialog, QDialogButtonBox from .Ui_FormSelectionDialog import Ui_FormSelectionDialog
--- a/ProjectFlask/Project.py Wed Nov 16 09:37:57 2022 +0100 +++ b/ProjectFlask/Project.py Wed Nov 16 09:41:50 2022 +0100 @@ -10,18 +10,18 @@ import os from PyQt6.QtCore import ( - pyqtSlot, + QFileInfo, QObject, QProcess, QProcessEnvironment, QTimer, - QFileInfo, + pyqtSlot, ) -from PyQt6.QtWidgets import QMenu, QDialog +from PyQt6.QtWidgets import QDialog, QMenu from eric7 import Utilities 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
--- a/ProjectFlask/RoutesDialog.py Wed Nov 16 09:37:57 2022 +0100 +++ b/ProjectFlask/RoutesDialog.py Wed Nov 16 09:41:50 2022 +0100 @@ -7,7 +7,7 @@ Module implementing a dialog to show the application routes. """ -from PyQt6.QtCore import pyqtSlot, QProcess +from PyQt6.QtCore import QProcess, pyqtSlot from PyQt6.QtWidgets import QDialog, QDialogButtonBox, QTreeWidgetItem from eric7.EricGui.EricOverrideCursor import EricOverrideCursor, EricOverridenCursor
--- a/ProjectFlask/RunServerDialog.py Wed Nov 16 09:37:57 2022 +0100 +++ b/ProjectFlask/RunServerDialog.py Wed Nov 16 09:41:50 2022 +0100 @@ -9,7 +9,7 @@ import re -from PyQt6.QtCore import pyqtSlot, Qt, QProcess, QTimer +from PyQt6.QtCore import QProcess, Qt, QTimer, pyqtSlot from PyQt6.QtGui import QTextCharFormat from PyQt6.QtWidgets import QDialog, QDialogButtonBox, QMenu @@ -17,13 +17,13 @@ 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 +from .Ui_RunServerDialog import Ui_RunServerDialog # TODO: should this be placed into the sidebar as a sidebar widget?
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pyproject.toml Wed Nov 16 09:41:50 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 = ["eric7"]
