Mercurial Repositories > eric / changeset

--- a/eric7/EricNetwork/EricSslInfoWidget.py	Fri Sep 24 16:34:46 2021 +0200
+++ b/eric7/EricNetwork/EricSslInfoWidget.py	Fri Sep 24 17:37:38 2021 +0200
@@ -164,14 +164,26 @@
             
             label = QLabel(self)
             label.setWordWrap(True)
-            label.setText(self.tr(
-                "It is encrypted using {0} at {1} bits, "
-                "with {2} for message authentication and "
-                "{3} as key exchange mechanism.\n\n").format(
-                cipher.encryptionMethod(),
-                cipher.usedBits(),
-                cipher.authenticationMethod(),
-                cipher.keyExchangeMethod()))
+            if (
+                not cipher.encryptionMethod() or
+                not cipher.usedBits() or
+                not cipher.authenticationMethod() or
+                not cipher.keyExchangeMethod()
+            ):
+                label.setText(self.tr(
+                    "The cipher data is incomplete or not known."
+                ))
+            else:
+                label.setText(self.tr(
+                    "It is encrypted using {0} at {1} bits, "
+                    "with {2} for message authentication and "
+                    "{3} as key exchange mechanism.\n\n").format(
+                    cipher.encryptionMethod(),
+                    cipher.usedBits(),
+                    cipher.authenticationMethod(),
+                    cipher.keyExchangeMethod()
+                    )
+                )
             layout.addWidget(label, rows, 1)
             rows += 1
     

--- a/eric7/UI/CodeDocumentationViewer.py	Fri Sep 24 16:34:46 2021 +0200
+++ b/eric7/UI/CodeDocumentationViewer.py	Fri Sep 24 17:37:38 2021 +0200
@@ -81,12 +81,6 @@
         self.__verticalLayout.setContentsMargins(0, 0, 0, 0)
         
         try:
-            # TODO: remove this workaround once rc0 issue is fixed
-            # Workaround for a bug in Qt 6.2.0 rc0 on non-Linux
-            import sys
-            if not sys.platform.startswith("linux"):
-                raise ImportError
-            
             from PyQt6.QtWebEngineCore import QWebEngineSettings
             from PyQt6.QtWebEngineWidgets import QWebEngineView
             self.__contents = QWebEngineView(self)

--- a/eric7/UI/Previewers/PreviewerHTML.py	Fri Sep 24 16:34:46 2021 +0200
+++ b/eric7/UI/Previewers/PreviewerHTML.py	Fri Sep 24 17:37:38 2021 +0200
@@ -51,11 +51,6 @@
         self.__previewAvailable = True
         
         try:
-            # TODO: remove this workaround once rc0 issue is fixed
-            # Workaround for a bug in Qt 6.2.0 rc0 on non-Linux
-            if not sys.platform.startswith("linux"):
-                raise ImportError
-            
             from PyQt6.QtWebEngineWidgets import QWebEngineView
             self.previewView = QWebEngineView(self)
             self.previewView.page().linkHovered.connect(self.__showLink)

--- a/eric7/eric7.py	Fri Sep 24 16:34:46 2021 +0200
+++ b/eric7/eric7.py	Fri Sep 24 17:37:38 2021 +0200
@@ -42,12 +42,9 @@
         " it is installed and accessible.")
     sys.exit(100)
 
-# TODO: remove this workaround once rc0 issue is fixed
-# Workaround for a bug in Qt 6.2.0 rc0 on non-Linux
-if sys.platform.startswith("linux"):
-    with contextlib.suppress(ImportError):
-        from PyQt6 import QtWebEngineWidgets
-        # __IGNORE_WARNING__ __IGNORE_EXCEPTION__
+with contextlib.suppress(ImportError):
+    from PyQt6 import QtWebEngineWidgets
+    # __IGNORE_WARNING__ __IGNORE_EXCEPTION__
 
 # some global variables needed to start the application
 args = None

--- a/eric7/eric7_browser.py	Fri Sep 24 16:34:46 2021 +0200
+++ b/eric7/eric7_browser.py	Fri Sep 24 17:37:38 2021 +0200
@@ -36,11 +36,6 @@
         sys.argv.remove(arg)
 
 try:
-    # TODO: remove this workaround once rc0 issue is fixed
-    # Workaround for a bug in Qt 6.2.0 rc0 on non-Linux
-    if not sys.platform.startswith("linux"):
-        raise ImportError
-    
     from PyQt6 import QtWebEngineWidgets    # __IGNORE_WARNING__
 except ImportError:
     if "--quiet" not in sys.argv: