Adapted to the official PyQt6 6.2.0 release. eric7

Sun, 03 Oct 2021 17:25:49 +0200

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Sun, 03 Oct 2021 17:25:49 +0200
branch
eric7
changeset 8663
a925267d1545
parent 8662
49781769bc43
child 8664
5aa1070daa48

Adapted to the official PyQt6 6.2.0 release.

eric7/EricNetwork/EricNetworkIcon.py file | annotate | diff | comparison | revisions
eric7/PluginManager/PluginRepositoryDialog.py file | annotate | diff | comparison | revisions
eric7/WebBrowser/SpellCheck/ManageDictionariesDialog.py file | annotate | diff | comparison | revisions
scripts/install.py file | annotate | diff | comparison | revisions
diff -r 49781769bc43 -r a925267d1545 eric7/EricNetwork/EricNetworkIcon.py
--- a/eric7/EricNetwork/EricNetworkIcon.py	Sun Oct 03 15:59:11 2021 +0200
+++ b/eric7/EricNetwork/EricNetworkIcon.py	Sun Oct 03 17:25:49 2021 +0200
@@ -46,12 +46,8 @@
             )
             self.__reachabilityChanged(
                 QNetworkInformation.instance().reachability())
-            
-            # TODO: remove this 'contextlib' with official relelase
-            import contextlib
-            with contextlib.suppress(Exception):
-                QNetworkInformation.instance().reachabilityChanged.connect(
-                    self.__reachabilityChanged)
+            QNetworkInformation.instance().reachabilityChanged.connect(
+                self.__reachabilityChanged)
         else:
             # assume to be 'always online' if no backend could be loaded or
             # dynamic online check is switched of
diff -r 49781769bc43 -r a925267d1545 eric7/PluginManager/PluginRepositoryDialog.py
--- a/eric7/PluginManager/PluginRepositoryDialog.py	Sun Oct 03 15:59:11 2021 +0200
+++ b/eric7/PluginManager/PluginRepositoryDialog.py	Sun Oct 03 17:25:49 2021 +0200
@@ -202,11 +202,8 @@
         ):
             self.__reachabilityChanged(
                 QNetworkInformation.instance().reachability())
-            # TODO: remove this 'contextlib' with official release
-            import contextlib
-            with contextlib.suppress(Exception):
-                QNetworkInformation.instance().reachabilityChanged.connect(
-                    self.__reachabilityChanged)
+            QNetworkInformation.instance().reachabilityChanged.connect(
+                self.__reachabilityChanged)
         else:
             # assume to be 'always online' if no backend could be loaded or
             # dynamic online check is switched of
diff -r 49781769bc43 -r a925267d1545 eric7/WebBrowser/SpellCheck/ManageDictionariesDialog.py
--- a/eric7/WebBrowser/SpellCheck/ManageDictionariesDialog.py	Sun Oct 03 15:59:11 2021 +0200
+++ b/eric7/WebBrowser/SpellCheck/ManageDictionariesDialog.py	Sun Oct 03 17:25:49 2021 +0200
@@ -75,11 +75,8 @@
         ):
             self.__reachabilityChanged(
                 QNetworkInformation.instance().reachability())
-            # TODO: remove this 'contextlib' with official relelase
-            import contextlib
-            with contextlib.suppress(Exception):
-                QNetworkInformation.instance().reachabilityChanged.connect(
-                    self.__reachabilityChanged)
+            QNetworkInformation.instance().reachabilityChanged.connect(
+                self.__reachabilityChanged)
         else:
             # assume to be 'always online' if no backend could be loaded or
             # dynamic online check is switched of
diff -r 49781769bc43 -r a925267d1545 scripts/install.py
--- a/scripts/install.py	Sun Oct 03 15:59:11 2021 +0200
+++ b/scripts/install.py	Sun Oct 03 17:25:49 2021 +0200
@@ -1453,13 +1453,12 @@
     """
     global verbose
     
-    # TODO: update as necessary for PyQt6 6.2.0
     requiredVersions = {
-        "pyqt6": 0x60101,
-        "pyqt6-charts": 0x60101,
-        "pyqt6-webengine": 0x60200,
-        "pyqt6-qscintilla": 0x20d00,
-        "sip": 0x60100,
+        "pyqt6": 0x60200,               # v6.2.0
+        "pyqt6-charts": 0x60200,        # v6.2.0
+        "pyqt6-webengine": 0x60200,     # v6.2.0
+        "pyqt6-qscintilla": 0x20d00,    # v2.13.0
+        "sip": 0x60100,                 # v6.1.0
     }
     
     try:
@@ -1527,7 +1526,6 @@
         if isSudo:
             print("Optional 'PyQt6-WebEngine' could not be detected.")
         else:
-            # TODO: should PyQt6-WebEngine be a must requirement?
             msg = (
                 "Optional 'PyQt6-WebEngine' could not be detected.{0}"
                 .format("\nError: {0}".format(err) if verbose else "")

eric ide

mercurial