Mercurial Repositories > eric / changeset

--- a/src/eric7/EricNetwork/EricSslUtilities.py	Fri Nov 04 11:55:41 2022 +0100
+++ b/src/eric7/EricNetwork/EricSslUtilities.py	Fri Nov 04 11:56:07 2022 +0100
@@ -12,17 +12,17 @@
     """
     Function to initialize some global SSL stuff.
     """
-    blacklist = [
-        "SRP-AES-256-CBC-SHA",  # open to MitM
-        "SRP-AES-128-CBC-SHA",  # open to MitM
-    ]
-
     try:
         from PyQt6.QtNetwork import QSslConfiguration
     except ImportError:
         # no SSL available, so there is nothing to initialize
         return
 
+    blacklist = [
+        "SRP-AES-256-CBC-SHA",  # open to MitM
+        "SRP-AES-128-CBC-SHA",  # open to MitM
+    ]
+
     strongCiphers = [
         c
         for c in QSslConfiguration.supportedCiphers()

--- a/src/eric7/MicroPython/MicroPythonWidget.py	Fri Nov 04 11:55:41 2022 +0100
+++ b/src/eric7/MicroPython/MicroPythonWidget.py	Fri Nov 04 11:56:07 2022 +0100
@@ -32,6 +32,11 @@
 from eric7.EricWidgets.EricProcessDialog import EricProcessDialog
 from eric7.EricGui.EricOverrideCursor import EricOverrideCursor, EricOverridenCursor
 
+from eric7.EricGui import EricPixmapCache
+from eric7 import Globals, Preferences, Utilities
+
+from eric7.UI.Info import BugAddress
+
 from .Ui_MicroPythonWidget import Ui_MicroPythonWidget
 
 from . import MicroPythonDevices
@@ -52,11 +57,6 @@
 except ImportError:
     HAS_QTSERIALPORT = False
 
-from eric7.EricGui import EricPixmapCache
-from eric7 import Globals, Preferences, Utilities
-
-from eric7.UI.Info import BugAddress
-
 # ANSI Colors (see https://en.wikipedia.org/wiki/ANSI_escape_code)
 AnsiColorSchemes = {
     "Windows 7": {

--- a/src/eric7/PipInterface/Pip.py	Fri Nov 04 11:55:41 2022 +0100
+++ b/src/eric7/PipInterface/Pip.py	Fri Nov 04 11:56:07 2022 +0100
@@ -16,6 +16,7 @@
 from PyQt6.QtWidgets import QDialog, QInputDialog, QLineEdit
 from PyQt6.QtNetwork import QNetworkAccessManager, QNetworkRequest, QNetworkReply
 
+from eric7 import Globals, Preferences
 from eric7.EricWidgets import EricMessageBox
 from eric7.EricWidgets.EricApplication import ericApp
 
@@ -31,8 +32,6 @@
 from .PipDialog import PipDialog
 from .PipVulnerabilityChecker import PipVulnerabilityChecker
 
-from eric7 import Globals, Preferences
-
 
 class Pip(QObject):
     """

--- a/src/eric7/PluginManager/PluginManager.py	Fri Nov 04 11:55:41 2022 +0100
+++ b/src/eric7/PluginManager/PluginManager.py	Fri Nov 04 11:56:07 2022 +0100
@@ -20,6 +20,9 @@
 from PyQt6.QtGui import QPixmap
 from PyQt6.QtNetwork import QNetworkAccessManager, QNetworkRequest, QNetworkReply
 
+from eric7.EricGui import EricPixmapCache
+from eric7 import Globals, Preferences, Utilities
+from eric7.Globals import getConfig
 from eric7.EricWidgets import EricMessageBox
 from eric7.EricWidgets.EricApplication import ericApp
 
@@ -44,12 +47,6 @@
     PluginClassFormatError,
 )
 
-from eric7.EricGui import EricPixmapCache
-
-from eric7 import Globals, Preferences, Utilities
-
-from eric7.Globals import getConfig
-
 
 class PluginManager(QObject):
     """

--- a/src/eric7/PluginManager/PluginRepositoryDialog.py	Fri Nov 04 11:55:41 2022 +0100
+++ b/src/eric7/PluginManager/PluginRepositoryDialog.py	Fri Nov 04 11:56:07 2022 +0100
@@ -42,8 +42,9 @@
     QNetworkInformation,
 )
 
-from .Ui_PluginRepositoryDialog import Ui_PluginRepositoryDialog
-
+from eric7 import Globals, Preferences, Utilities
+from eric7.EricGui import EricPixmapCache
+from eric7.Globals import getConfig
 from eric7.EricWidgets import EricMessageBox
 from eric7.EricWidgets.EricMainWindow import EricMainWindow
 from eric7.EricWidgets.EricApplication import ericApp
@@ -60,11 +61,7 @@
 except ImportError:
     SSL_AVAILABLE = False
 
-from eric7 import Globals, Preferences, Utilities
-
-from eric7.EricGui import EricPixmapCache
-
-from eric7.Globals import getConfig
+from .Ui_PluginRepositoryDialog import Ui_PluginRepositoryDialog
 
 
 class PluginRepositoryWidget(QWidget, Ui_PluginRepositoryDialog):

--- a/src/eric7/Preferences/__init__.py	Fri Nov 04 11:55:41 2022 +0100
+++ b/src/eric7/Preferences/__init__.py	Fri Nov 04 11:56:07 2022 +0100
@@ -23,6 +23,7 @@
 import shutil
 import json
 
+from PyQt6.Qsci import QsciScintilla, QsciLexerPython
 from PyQt6.QtCore import (
     QDir,
     QPoint,
@@ -44,7 +45,6 @@
     from PyQt6.QtWebEngineCore import QWebEngineSettings, QWebEngineProfile
 except ImportError:
     QWebEngineSettings = None
-from PyQt6.Qsci import QsciScintilla, QsciLexerPython
 
 from eric7.EricWidgets import EricFileDialog
 from eric7.EricWidgets.EricIconBar import EricIconBar

--- a/src/eric7/UI/UserInterface.py	Fri Nov 04 11:55:41 2022 +0100
+++ b/src/eric7/UI/UserInterface.py	Fri Nov 04 11:56:07 2022 +0100
@@ -66,6 +66,7 @@
 from eric7.EricWidgets.EricZoomWidget import EricZoomWidget
 from eric7.EricWidgets.EricClickableLabel import EricClickableLabel
 
+from eric7.Globals import getConfig
 from eric7 import Globals, Preferences, Utilities
 
 from eric7.EricGui import EricPixmapCache
@@ -90,8 +91,6 @@
 except ImportError:
     SSL_AVAILABLE = False
 
-from eric7.Globals import getConfig
-
 
 class Redirector(QObject):
     """

--- a/src/eric7/WebBrowser/Network/NetworkManager.py	Fri Nov 04 11:55:41 2022 +0100
+++ b/src/eric7/WebBrowser/Network/NetworkManager.py	Fri Nov 04 11:56:07 2022 +0100
@@ -24,6 +24,10 @@
 
 from eric7.EricNetwork.EricNetworkProxyFactory import proxyAuthenticationRequired
 
+from eric7.WebBrowser.WebBrowserWindow import WebBrowserWindow
+from eric7.Utilities.AutoSaver import AutoSaver
+from eric7 import Preferences
+
 try:
     from eric7.EricNetwork.EricSslErrorHandler import EricSslErrorHandler
 
@@ -31,13 +35,9 @@
 except ImportError:
     SSL_AVAILABLE = False
 
-from eric7.WebBrowser.WebBrowserWindow import WebBrowserWindow
 from .NetworkUrlInterceptor import NetworkUrlInterceptor
 from ..Tools.WebBrowserTools import getHtmlPage, pixmapToDataUrl
 
-from eric7.Utilities.AutoSaver import AutoSaver
-from eric7 import Preferences
-
 
 class NetworkManager(QNetworkAccessManager):
     """