Mercurial Repositories > eric / changeset

--- a/src/eric7/EricCore/EricFileSystemWatcher.py	Fri May 31 15:18:05 2024 +0200
+++ b/src/eric7/EricCore/EricFileSystemWatcher.py	Fri May 31 15:18:47 2024 +0200
@@ -13,6 +13,7 @@
 from watchdog.events import EVENT_TYPE_CLOSED, EVENT_TYPE_OPENED, FileSystemEventHandler
 
 from eric7.SystemUtilities import OSUtilities
+
 if OSUtilities.isMacPlatform():
     from watchdog.observers.kqueue import KqueueObserver as Observer
 else:

--- a/src/eric7/Network/IRC/IrcChannelWidget.py	Fri May 31 15:18:05 2024 +0200
+++ b/src/eric7/Network/IRC/IrcChannelWidget.py	Fri May 31 15:18:47 2024 +0200
@@ -32,12 +32,12 @@
 )
 
 from eric7 import Preferences, Utilities
+from eric7.__version__ import Version
 from eric7.EricGui import EricPixmapCache
 from eric7.EricWidgets import EricFileDialog, EricMessageBox
 from eric7.EricWidgets.EricApplication import ericApp
 from eric7.SystemUtilities import OSUtilities
 from eric7.UI.Info import Copyright
-from eric7.__version__ import Version
 
 from .IrcUtilities import getChannelModesDict, ircFilter, ircTimestamp
 from .Ui_IrcChannelWidget import Ui_IrcChannelWidget

--- a/src/eric7/Network/IRC/IrcWidget.py	Fri May 31 15:18:05 2024 +0200
+++ b/src/eric7/Network/IRC/IrcWidget.py	Fri May 31 15:18:47 2024 +0200
@@ -28,11 +28,11 @@
     SSL_AVAILABLE = False
 
 from eric7 import Preferences
+from eric7.__version__ import Version
 from eric7.EricGui import EricPixmapCache
 from eric7.EricWidgets import EricMessageBox
 from eric7.SystemUtilities import OSUtilities
 from eric7.UI.Info import Copyright
-from eric7.__version__ import Version
 
 from .IrcNetworkManager import IrcNetworkManager
 from .Ui_IrcWidget import Ui_IrcWidget

--- a/src/eric7/Plugins/AboutPlugin/AboutDialog.py	Fri May 31 15:18:05 2024 +0200
+++ b/src/eric7/Plugins/AboutPlugin/AboutDialog.py	Fri May 31 15:18:47 2024 +0200
@@ -11,9 +11,9 @@
 from PyQt6.QtWidgets import QDialog
 
 from eric7 import Preferences
+from eric7.__version__ import Version
 from eric7.EricGui import EricPixmapCache
 from eric7.UI import Info
-from eric7.__version__ import Version
 
 from .Ui_AboutDialog import Ui_AboutDialog
 

--- a/src/eric7/Plugins/PluginCodeStyleChecker.py	Fri May 31 15:18:05 2024 +0200
+++ b/src/eric7/Plugins/PluginCodeStyleChecker.py	Fri May 31 15:18:47 2024 +0200
@@ -13,8 +13,8 @@
 
 from PyQt6.QtCore import QCoreApplication, QObject, pyqtSignal
 
+from eric7 import Preferences
 from eric7.__version__ import VersionOnly
-from eric7 import Preferences
 from eric7.EricGui.EricAction import EricAction
 from eric7.EricWidgets.EricApplication import ericApp
 from eric7.Project.ProjectBrowserModel import ProjectBrowserFileItem

--- a/src/eric7/Plugins/PluginEricapi.py	Fri May 31 15:18:05 2024 +0200
+++ b/src/eric7/Plugins/PluginEricapi.py	Fri May 31 15:18:47 2024 +0200
@@ -12,11 +12,11 @@
 from PyQt6.QtCore import QCoreApplication, QObject, pyqtSlot
 from PyQt6.QtWidgets import QDialog
 
+from eric7.__version__ import VersionOnly
 from eric7.EricGui.EricAction import EricAction
 from eric7.EricWidgets.EricApplication import ericApp
 from eric7.Globals import getConfig
 from eric7.SystemUtilities import FileSystemUtilities, OSUtilities, PythonUtilities
-from eric7.__version__ import VersionOnly
 
 # Start-Of-Header
 __header__ = {

--- a/src/eric7/Plugins/PluginEricdoc.py	Fri May 31 15:18:05 2024 +0200
+++ b/src/eric7/Plugins/PluginEricdoc.py	Fri May 31 15:18:47 2024 +0200
@@ -13,6 +13,7 @@
 from PyQt6.QtWidgets import QDialog
 
 from eric7 import Preferences
+from eric7.__version__ import VersionOnly
 from eric7.EricGui.EricAction import EricAction
 from eric7.EricWidgets.EricApplication import ericApp
 from eric7.Globals import getConfig
@@ -22,7 +23,6 @@
     PythonUtilities,
     QtUtilities,
 )
-from eric7.__version__ import VersionOnly
 
 # Start-Of-Header
 __header__ = {

--- a/src/eric7/Plugins/PluginSyntaxChecker.py	Fri May 31 15:18:05 2024 +0200
+++ b/src/eric7/Plugins/PluginSyntaxChecker.py	Fri May 31 15:18:47 2024 +0200
@@ -13,11 +13,11 @@
 from PyQt6.QtCore import QObject
 
 from eric7 import Preferences
+from eric7.__version__ import VersionOnly
 from eric7.EricGui.EricAction import EricAction
 from eric7.EricWidgets.EricApplication import ericApp
 from eric7.Globals import getConfig
 from eric7.Project.ProjectBrowserModel import ProjectBrowserFileItem
-from eric7.__version__ import VersionOnly
 
 # Start-Of-Header
 __header__ = {

--- a/src/eric7/Plugins/PluginTranslator.py	Fri May 31 15:18:05 2024 +0200
+++ b/src/eric7/Plugins/PluginTranslator.py	Fri May 31 15:18:47 2024 +0200
@@ -12,9 +12,9 @@
 from PyQt6.QtCore import QCoreApplication, QObject, pyqtSignal
 
 from eric7 import Preferences
+from eric7.__version__ import VersionOnly
 from eric7.EricWidgets.EricApplication import ericApp
 from eric7.Plugins.UiExtensionPlugins.Translator.Translator import Translator
-from eric7.__version__ import VersionOnly
 
 # Start-Of-Header
 __header__ = {

--- a/src/eric7/Plugins/PluginVcsGit.py	Fri May 31 15:18:05 2024 +0200
+++ b/src/eric7/Plugins/PluginVcsGit.py	Fri May 31 15:18:47 2024 +0200
@@ -13,11 +13,11 @@
 from PyQt6.QtCore import QByteArray, QCoreApplication, QObject
 
 from eric7 import Preferences
+from eric7.__version__ import VersionOnly
 from eric7.EricWidgets.EricApplication import ericApp
 from eric7.Plugins.VcsPlugins.vcsGit.GitUtilities import getConfigPath
 from eric7.Preferences.Shortcuts import readShortcuts
 from eric7.SystemUtilities import FileSystemUtilities, OSUtilities
-from eric7.__version__ import VersionOnly
 
 # Start-Of-Header
 __header__ = {

--- a/src/eric7/Plugins/PluginVcsMercurial.py	Fri May 31 15:18:05 2024 +0200
+++ b/src/eric7/Plugins/PluginVcsMercurial.py	Fri May 31 15:18:47 2024 +0200
@@ -13,6 +13,7 @@
 from PyQt6.QtCore import QByteArray, QCoreApplication, QObject
 
 from eric7 import Preferences
+from eric7.__version__ import VersionOnly
 from eric7.EricWidgets.EricApplication import ericApp
 from eric7.Plugins.VcsPlugins.vcsMercurial.HgUtilities import (
     getConfigPath,
@@ -20,7 +21,6 @@
 )
 from eric7.Preferences.Shortcuts import readShortcuts
 from eric7.SystemUtilities import FileSystemUtilities
-from eric7.__version__ import VersionOnly
 
 # Start-Of-Header
 __header__ = {

--- a/src/eric7/Plugins/PluginVcsPySvn.py	Fri May 31 15:18:05 2024 +0200
+++ b/src/eric7/Plugins/PluginVcsPySvn.py	Fri May 31 15:18:47 2024 +0200
@@ -14,10 +14,10 @@
 from PyQt6.QtCore import QCoreApplication, QObject
 
 from eric7 import Preferences
+from eric7.__version__ import VersionOnly
 from eric7.EricWidgets.EricApplication import ericApp
 from eric7.Plugins.VcsPlugins.vcsPySvn.SvnUtilities import getConfigPath, getServersPath
 from eric7.Preferences.Shortcuts import readShortcuts
-from eric7.__version__ import VersionOnly
 
 # Start-Of-Header
 __header__ = {

--- a/src/eric7/Plugins/PluginVcsSubversion.py	Fri May 31 15:18:05 2024 +0200
+++ b/src/eric7/Plugins/PluginVcsSubversion.py	Fri May 31 15:18:47 2024 +0200
@@ -13,6 +13,7 @@
 from PyQt6.QtCore import QCoreApplication, QObject
 
 from eric7 import Preferences
+from eric7.__version__ import VersionOnly
 from eric7.EricWidgets.EricApplication import ericApp
 from eric7.Plugins.VcsPlugins.vcsSubversion.SvnUtilities import (
     getConfigPath,
@@ -20,7 +21,6 @@
 )
 from eric7.Preferences.Shortcuts import readShortcuts
 from eric7.SystemUtilities import FileSystemUtilities, OSUtilities
-from eric7.__version__ import VersionOnly
 
 # Start-Of-Header
 __header__ = {

--- a/src/eric7/Plugins/PluginWizardDotDesktop.py	Fri May 31 15:18:05 2024 +0200
+++ b/src/eric7/Plugins/PluginWizardDotDesktop.py	Fri May 31 15:18:47 2024 +0200
@@ -10,10 +10,10 @@
 from PyQt6.QtCore import QObject
 from PyQt6.QtWidgets import QDialog
 
+from eric7.__version__ import VersionOnly
 from eric7.EricGui.EricAction import EricAction
 from eric7.EricWidgets import EricMessageBox
 from eric7.EricWidgets.EricApplication import ericApp
-from eric7.__version__ import VersionOnly
 
 # Start-of-Header
 __header__ = {

--- a/src/eric7/Plugins/PluginWizardEricMessageBox.py	Fri May 31 15:18:05 2024 +0200
+++ b/src/eric7/Plugins/PluginWizardEricMessageBox.py	Fri May 31 15:18:47 2024 +0200
@@ -10,10 +10,10 @@
 from PyQt6.QtCore import QObject
 from PyQt6.QtWidgets import QDialog
 
+from eric7.__version__ import VersionOnly
 from eric7.EricGui.EricAction import EricAction
 from eric7.EricWidgets import EricMessageBox
 from eric7.EricWidgets.EricApplication import ericApp
-from eric7.__version__ import VersionOnly
 
 # Start-Of-Header
 __header__ = {

--- a/src/eric7/Plugins/PluginWizardEricPlugin.py	Fri May 31 15:18:05 2024 +0200
+++ b/src/eric7/Plugins/PluginWizardEricPlugin.py	Fri May 31 15:18:47 2024 +0200
@@ -12,10 +12,10 @@
 from PyQt6.QtCore import QObject
 from PyQt6.QtWidgets import QDialog
 
+from eric7.__version__ import VersionOnly
 from eric7.EricGui.EricAction import EricAction
 from eric7.EricWidgets import EricMessageBox
 from eric7.EricWidgets.EricApplication import ericApp
-from eric7.__version__ import VersionOnly
 
 # Start-of-Header
 __header__ = {

--- a/src/eric7/Plugins/PluginWizardPyRegExp.py	Fri May 31 15:18:05 2024 +0200
+++ b/src/eric7/Plugins/PluginWizardPyRegExp.py	Fri May 31 15:18:47 2024 +0200
@@ -10,10 +10,10 @@
 from PyQt6.QtCore import QObject
 from PyQt6.QtWidgets import QDialog
 
+from eric7.__version__ import VersionOnly
 from eric7.EricGui.EricAction import EricAction
 from eric7.EricWidgets import EricMessageBox
 from eric7.EricWidgets.EricApplication import ericApp
-from eric7.__version__ import VersionOnly
 
 # Start-Of-Header
 __header__ = {

--- a/src/eric7/Plugins/PluginWizardQColorDialog.py	Fri May 31 15:18:05 2024 +0200
+++ b/src/eric7/Plugins/PluginWizardQColorDialog.py	Fri May 31 15:18:47 2024 +0200
@@ -10,10 +10,10 @@
 from PyQt6.QtCore import QObject
 from PyQt6.QtWidgets import QDialog
 
+from eric7.__version__ import VersionOnly
 from eric7.EricGui.EricAction import EricAction
 from eric7.EricWidgets import EricMessageBox
 from eric7.EricWidgets.EricApplication import ericApp
-from eric7.__version__ import VersionOnly
 
 # Start-Of-Header
 __header__ = {

--- a/src/eric7/Plugins/PluginWizardQFileDialog.py	Fri May 31 15:18:05 2024 +0200
+++ b/src/eric7/Plugins/PluginWizardQFileDialog.py	Fri May 31 15:18:47 2024 +0200
@@ -12,10 +12,10 @@
 from PyQt6.QtCore import QObject
 from PyQt6.QtWidgets import QDialog
 
+from eric7.__version__ import VersionOnly
 from eric7.EricGui.EricAction import EricAction
 from eric7.EricWidgets import EricMessageBox
 from eric7.EricWidgets.EricApplication import ericApp
-from eric7.__version__ import VersionOnly
 
 # Start-Of-Header
 __header__ = {

--- a/src/eric7/Plugins/PluginWizardQFontDialog.py	Fri May 31 15:18:05 2024 +0200
+++ b/src/eric7/Plugins/PluginWizardQFontDialog.py	Fri May 31 15:18:47 2024 +0200
@@ -10,10 +10,10 @@
 from PyQt6.QtCore import QObject
 from PyQt6.QtWidgets import QDialog
 
+from eric7.__version__ import VersionOnly
 from eric7.EricGui.EricAction import EricAction
 from eric7.EricWidgets import EricMessageBox
 from eric7.EricWidgets.EricApplication import ericApp
-from eric7.__version__ import VersionOnly
 
 # Start-Of-Header
 __header__ = {

--- a/src/eric7/Plugins/PluginWizardQInputDialog.py	Fri May 31 15:18:05 2024 +0200
+++ b/src/eric7/Plugins/PluginWizardQInputDialog.py	Fri May 31 15:18:47 2024 +0200
@@ -10,10 +10,10 @@
 from PyQt6.QtCore import QObject
 from PyQt6.QtWidgets import QDialog
 
+from eric7.__version__ import VersionOnly
 from eric7.EricGui.EricAction import EricAction
 from eric7.EricWidgets import EricMessageBox
 from eric7.EricWidgets.EricApplication import ericApp
-from eric7.__version__ import VersionOnly
 
 # Start-Of-Header
 __header__ = {

--- a/src/eric7/Plugins/PluginWizardQMessageBox.py	Fri May 31 15:18:05 2024 +0200
+++ b/src/eric7/Plugins/PluginWizardQMessageBox.py	Fri May 31 15:18:47 2024 +0200
@@ -10,10 +10,10 @@
 from PyQt6.QtCore import QObject
 from PyQt6.QtWidgets import QDialog
 
+from eric7.__version__ import VersionOnly
 from eric7.EricGui.EricAction import EricAction
 from eric7.EricWidgets import EricMessageBox
 from eric7.EricWidgets.EricApplication import ericApp
-from eric7.__version__ import VersionOnly
 
 # Start-Of-Header
 __header__ = {

--- a/src/eric7/Plugins/PluginWizardQRegularExpression.py	Fri May 31 15:18:05 2024 +0200
+++ b/src/eric7/Plugins/PluginWizardQRegularExpression.py	Fri May 31 15:18:47 2024 +0200
@@ -10,10 +10,10 @@
 from PyQt6.QtCore import QObject
 from PyQt6.QtWidgets import QDialog
 
+from eric7.__version__ import VersionOnly
 from eric7.EricGui.EricAction import EricAction
 from eric7.EricWidgets import EricMessageBox
 from eric7.EricWidgets.EricApplication import ericApp
-from eric7.__version__ import VersionOnly
 
 # Start-Of-Header
 __header__ = {

--- a/src/eric7/Plugins/PluginWizardSetup.py	Fri May 31 15:18:05 2024 +0200
+++ b/src/eric7/Plugins/PluginWizardSetup.py	Fri May 31 15:18:47 2024 +0200
@@ -11,10 +11,10 @@
 
 from PyQt6.QtCore import QObject
 
+from eric7.__version__ import VersionOnly
 from eric7.EricGui.EricAction import EricAction
 from eric7.EricWidgets import EricMessageBox
 from eric7.EricWidgets.EricApplication import ericApp
-from eric7.__version__ import VersionOnly
 
 # Start-of-Header
 __header__ = {

--- a/src/eric7/Tools/TrayStarter.py	Fri May 31 15:18:05 2024 +0200
+++ b/src/eric7/Tools/TrayStarter.py	Fri May 31 15:18:47 2024 +0200
@@ -19,12 +19,12 @@
 from PyQt6.QtWidgets import QApplication, QDialog, QMenu, QSystemTrayIcon
 
 from eric7 import Globals, Preferences
+from eric7.__version__ import Version
 from eric7.EricGui import EricPixmapCache
 from eric7.EricWidgets import EricMessageBox
 from eric7.EricWidgets.EricApplication import ericApp
 from eric7.SystemUtilities import DesktopUtilities, FileSystemUtilities, PythonUtilities
 from eric7.UI.Info import Program
-from eric7.__version__ import Version
 
 
 class TrayStarter(QSystemTrayIcon):

--- a/src/eric7/UI/UserInterface.py	Fri May 31 15:18:05 2024 +0200
+++ b/src/eric7/UI/UserInterface.py	Fri May 31 15:18:47 2024 +0200
@@ -60,6 +60,7 @@
 )
 
 from eric7 import Globals, Preferences, Testing, Utilities
+from eric7.__version__ import Version, VersionOnly
 from eric7.CondaInterface.Conda import Conda
 from eric7.Debugger.DebugServer import DebugServer
 from eric7.Debugger.DebugUI import DebugUI
@@ -98,12 +99,10 @@
 from eric7.Testing.TestingWidget import clearSavedHistories
 from eric7.Utilities.BackgroundService import BackgroundService
 from eric7.VirtualEnv.VirtualenvManager import VirtualenvManager
-from eric7.__version__ import Version, VersionOnly
 
 from .Info import BugAddress, FeatureAddress, Program
 from .NotificationWidget import NotificationTypes
 
-
 try:
     from eric7.EricNetwork.EricSslErrorHandler import (
         EricSslErrorHandler,

--- a/src/eric7/WebBrowser/WebBrowserView.py	Fri May 31 15:18:05 2024 +0200
+++ b/src/eric7/WebBrowser/WebBrowserView.py	Fri May 31 15:18:47 2024 +0200
@@ -49,6 +49,7 @@
 from PyQt6.QtWidgets import QApplication, QDialog, QMenu, QStyle
 
 from eric7 import Preferences
+from eric7.__version__ import VersionOnly
 from eric7.EricGui import EricPixmapCache
 from eric7.EricWidgets import EricFileDialog, EricMessageBox
 from eric7.EricWidgets.EricApplication import ericApp
@@ -56,7 +57,6 @@
 from eric7.UI.Info import Homepage
 from eric7.WebBrowser.WebBrowserWindow import WebBrowserWindow
 from eric7.WebBrowser.ZoomManager import ZoomManager
-from eric7.__version__ import VersionOnly
 
 from . import WebInspector
 from .Tools import Scripts, WebBrowserTools

--- a/src/eric7/WebBrowser/WebBrowserWindow.py	Fri May 31 15:18:05 2024 +0200
+++ b/src/eric7/WebBrowser/WebBrowserWindow.py	Fri May 31 15:18:47 2024 +0200
@@ -63,6 +63,7 @@
     QTHELP_AVAILABLE = False
 
 from eric7 import Globals, Preferences, Utilities
+from eric7.__version__ import Version
 from eric7.EricGui import EricPixmapCache
 from eric7.EricGui.EricAction import EricAction
 from eric7.EricGui.EricOverrideCursor import EricOverrideCursor
@@ -84,7 +85,6 @@
     PythonUtilities,
     QtUtilities,
 )
-from eric7.__version__ import Version
 from eric7.UI.NotificationWidget import NotificationTypes
 from eric7.WebBrowser.Tools import WebIconProvider
 from eric7.WebBrowser.ZoomManager import ZoomManager

--- a/src/eric7/eric7_api.py	Fri May 31 15:18:05 2024 +0200
+++ b/src/eric7/eric7_api.py	Fri May 31 15:18:47 2024 +0200
@@ -19,9 +19,9 @@
 import sys
 
 from eric7 import DocumentationTools
+from eric7.__version__ import Version
 from eric7.DocumentationTools.APIGenerator import APIGenerator
 from eric7.SystemUtilities import FileSystemUtilities, OSUtilities
-from eric7.__version__ import Version
 from eric7.Utilities import ModuleParser
 
 

--- a/src/eric7/eric7_doc.py	Fri May 31 15:18:05 2024 +0200
+++ b/src/eric7/eric7_doc.py	Fri May 31 15:18:47 2024 +0200
@@ -19,13 +19,13 @@
 import shutil
 import sys
 
+from eric7.__version__ import Version
 from eric7.DocumentationTools import TemplatesListsStyleCSS
 from eric7.DocumentationTools.Config import eric7docDefaultColors
 from eric7.DocumentationTools.IndexGenerator import IndexGenerator
 from eric7.DocumentationTools.ModuleDocumentor import ModuleDocument
 from eric7.DocumentationTools.QtHelpGenerator import QtHelpGenerator
 from eric7.SystemUtilities import FileSystemUtilities, OSUtilities
-from eric7.__version__ import Version
 from eric7.Utilities import ModuleParser
 
 # list of supported filename extensions