Mercurial Repositories > eric / file diff

diff -r fb0ef164f536 -r 698ae46f40a4 eric6/WebBrowser/Sync/SyncManager.py
--- a/eric6/WebBrowser/Sync/SyncManager.py	Fri Apr 02 11:59:41 2021 +0200
+++ b/eric6/WebBrowser/Sync/SyncManager.py	Sat May 01 14:27:20 2021 +0200
@@ -7,6 +7,8 @@
 Module implementing the synchronization manager class.
 """
 
+import contextlib
+
 from PyQt5.QtCore import QObject, pyqtSignal
 
 import Preferences
@@ -40,7 +42,7 @@
         
         @param parent reference to the parent object (QObject)
         """
-        super(SyncManager, self).__init__(parent)
+        super().__init__(parent)
         
         self.__handler = None
     
@@ -102,13 +104,11 @@
                     .bookmarksSaved.connect(self.__syncBookmarks)
                 )
             else:
-                try:
+                with contextlib.suppress(TypeError):
                     (
                         WebBrowserWindow.bookmarksManager()
                         .bookmarksSaved.disconnect(self.__syncBookmarks)
                     )
-                except TypeError:
-                    pass
             
             # connect sync manager to history manager
             if Preferences.getWebBrowser("SyncHistory"):
@@ -117,13 +117,11 @@
                     .connect(self.__syncHistory)
                 )
             else:
-                try:
+                with contextlib.suppress(TypeError):
                     (
                         WebBrowserWindow.historyManager()
                         .historySaved.disconnect(self.__syncHistory)
                     )
-                except TypeError:
-                    pass
             
             # connect sync manager to passwords manager
             if Preferences.getWebBrowser("SyncPasswords"):
@@ -132,13 +130,11 @@
                     .passwordsSaved.connect(self.__syncPasswords)
                 )
             else:
-                try:
+                with contextlib.suppress(TypeError):
                     (
                         WebBrowserWindow.passwordManager()
                         .passwordsSaved.disconnect(self.__syncPasswords)
                     )
-                except TypeError:
-                    pass
             
             # connect sync manager to user agent manager
             if Preferences.getWebBrowser("SyncUserAgents"):
@@ -147,14 +143,12 @@
                     .userAgentSettingsSaved.connect(self.__syncUserAgents)
                 )
             else:
-                try:
+                with contextlib.suppress(TypeError):
                     (
                         WebBrowserWindow.userAgentsManager()
                         .userAgentSettingsSaved.disconnect(
                             self.__syncUserAgents)
                     )
-                except TypeError:
-                    pass
             
             # connect sync manager to speed dial
             if Preferences.getWebBrowser("SyncSpeedDial"):
@@ -163,49 +157,37 @@
                     .speedDialSaved.connect(self.__syncSpeedDial)
                 )
             else:
-                try:
+                with contextlib.suppress(TypeError):
                     (
                         WebBrowserWindow.speedDial()
                         .speedDialSaved.disconnect(self.__syncSpeedDial)
                     )
-                except TypeError:
-                    pass
         else:
             self.__handler = None
             
-            try:
+            with contextlib.suppress(TypeError):
                 (
                     WebBrowserWindow.bookmarksManager()
                     .bookmarksSaved.disconnect(self.__syncBookmarks)
                 )
-            except TypeError:
-                pass
-            try:
+            with contextlib.suppress(TypeError):
                 (
                     WebBrowserWindow.historyManager().historySaved
                     .disconnect(self.__syncHistory)
                 )
-            except TypeError:
-                pass
-            try:
+            with contextlib.suppress(TypeError):
                 (
                     WebBrowserWindow.passwordManager()
                     .passwordsSaved.disconnect(self.__syncPasswords)
                 )
-            except TypeError:
-                pass
-            try:
+            with contextlib.suppress(TypeError):
                 (
                     WebBrowserWindow.userAgentsManager()
                     .userAgentSettingsSaved.disconnect(self.__syncUserAgents)
                 )
-            except TypeError:
-                pass
-            try:
+            with contextlib.suppress(TypeError):
                 WebBrowserWindow.speedDial().speedDialSaved.disconnect(
                     self.__syncSpeedDial)
-            except TypeError:
-                pass
     
     def syncEnabled(self):
         """