diff -r a28338eaf694 -r 0c63ea7f94bd eric6/WebBrowser/Sync/SyncManager.py
--- a/eric6/WebBrowser/Sync/SyncManager.py Wed Sep 25 18:48:22 2019 +0200
+++ b/eric6/WebBrowser/Sync/SyncManager.py Wed Sep 25 18:52:40 2019 +0200
@@ -77,12 +77,16 @@
if self.syncEnabled():
from . import SyncGlobals
- if Preferences.getWebBrowser("SyncType") == \
- SyncGlobals.SyncTypeFtp:
+ if (
+ Preferences.getWebBrowser("SyncType") ==
+ SyncGlobals.SyncTypeFtp
+ ):
from .FtpSyncHandler import FtpSyncHandler
self.__handler = FtpSyncHandler(self)
- elif Preferences.getWebBrowser("SyncType") == \
- SyncGlobals.SyncTypeDirectory:
+ elif (
+ Preferences.getWebBrowser("SyncType") ==
+ SyncGlobals.SyncTypeDirectory
+ ):
from .DirectorySyncHandler import DirectorySyncHandler
self.__handler = DirectorySyncHandler(self)
self.__handler.syncError.connect(self.__syncError)
@@ -94,85 +98,113 @@
# connect sync manager to bookmarks manager
if Preferences.getWebBrowser("SyncBookmarks"):
- WebBrowserWindow.bookmarksManager()\
+ (
+ WebBrowserWindow.bookmarksManager()
.bookmarksSaved.connect(self.__syncBookmarks)
+ )
else:
try:
- WebBrowserWindow.bookmarksManager()\
+ (
+ WebBrowserWindow.bookmarksManager()
.bookmarksSaved.disconnect(self.__syncBookmarks)
+ )
except TypeError:
pass
# connect sync manager to history manager
if Preferences.getWebBrowser("SyncHistory"):
- WebBrowserWindow.historyManager().historySaved\
+ (
+ WebBrowserWindow.historyManager().historySaved
.connect(self.__syncHistory)
+ )
else:
try:
- WebBrowserWindow.historyManager()\
+ (
+ WebBrowserWindow.historyManager()
.historySaved.disconnect(self.__syncHistory)
+ )
except TypeError:
pass
# connect sync manager to passwords manager
if Preferences.getWebBrowser("SyncPasswords"):
- WebBrowserWindow.passwordManager()\
+ (
+ WebBrowserWindow.passwordManager()
.passwordsSaved.connect(self.__syncPasswords)
+ )
else:
try:
- WebBrowserWindow.passwordManager()\
+ (
+ WebBrowserWindow.passwordManager()
.passwordsSaved.disconnect(self.__syncPasswords)
+ )
except TypeError:
pass
# connect sync manager to user agent manager
if Preferences.getWebBrowser("SyncUserAgents"):
- WebBrowserWindow.userAgentsManager()\
+ (
+ WebBrowserWindow.userAgentsManager()
.userAgentSettingsSaved.connect(self.__syncUserAgents)
+ )
else:
try:
- WebBrowserWindow.userAgentsManager()\
+ (
+ WebBrowserWindow.userAgentsManager()
.userAgentSettingsSaved.disconnect(
self.__syncUserAgents)
+ )
except TypeError:
pass
# connect sync manager to speed dial
if Preferences.getWebBrowser("SyncSpeedDial"):
- WebBrowserWindow.speedDial()\
+ (
+ WebBrowserWindow.speedDial()
.speedDialSaved.connect(self.__syncSpeedDial)
+ )
else:
try:
- WebBrowserWindow.speedDial()\
+ (
+ WebBrowserWindow.speedDial()
.speedDialSaved.disconnect(self.__syncSpeedDial)
+ )
except TypeError:
pass
else:
self.__handler = None
try:
- WebBrowserWindow.bookmarksManager()\
+ (
+ WebBrowserWindow.bookmarksManager()
.bookmarksSaved.disconnect(self.__syncBookmarks)
+ )
except TypeError:
pass
try:
- WebBrowserWindow.historyManager().historySaved\
+ (
+ WebBrowserWindow.historyManager().historySaved
.disconnect(self.__syncHistory)
+ )
except TypeError:
pass
try:
- WebBrowserWindow.passwordManager()\
+ (
+ WebBrowserWindow.passwordManager()
.passwordsSaved.disconnect(self.__syncPasswords)
+ )
except TypeError:
pass
try:
- WebBrowserWindow.userAgentsManager()\
+ (
+ WebBrowserWindow.userAgentsManager()
.userAgentSettingsSaved.disconnect(self.__syncUserAgents)
+ )
except TypeError:
pass
try:
- WebBrowserWindow.speedDial()\
- .speedDialSaved.disconnect(self.__syncSpeedDial)
+ WebBrowserWindow.speedDial().speedDialSaved.disconnect(
+ self.__syncSpeedDial)
except TypeError:
pass
@@ -183,8 +215,10 @@
@return flag indicating enabled synchronization
"""
from . import SyncGlobals
- return Preferences.getWebBrowser("SyncEnabled") and \
+ return (
+ Preferences.getWebBrowser("SyncEnabled") and
Preferences.getWebBrowser("SyncType") != SyncGlobals.SyncTypeNone
+ )
def __syncBookmarks(self):
"""
