diff -r 799196d0b05d -r 12ebd3934fef eric7/WebBrowser/Sync/FtpSyncHandler.py
--- a/eric7/WebBrowser/Sync/FtpSyncHandler.py Sat May 22 12:54:57 2021 +0200
+++ b/eric7/WebBrowser/Sync/FtpSyncHandler.py Sat May 22 16:52:45 2021 +0200
@@ -15,7 +15,7 @@
pyqtSignal, QTimer, QFileInfo, QCoreApplication, QByteArray
)
-from E5Network.E5Ftp import E5Ftp, E5FtpProxyType, E5FtpProxyError
+from EricNetwork.EricFtp import EricFtp, EricFtpProxyType, EricFtpProxyError
from .SyncHandler import SyncHandler
@@ -81,20 +81,20 @@
Preferences.getWebBrowser("SyncFtpIdleTimeout") * 1000)
self.__idleTimer.timeout.connect(self.__idleTimeout)
- self.__ftp = E5Ftp()
+ self.__ftp = EricFtp()
# do proxy setup
proxyType = (
- E5FtpProxyType.NO_PROXY
+ EricFtpProxyType.NO_PROXY
if not Preferences.getUI("UseProxy") else
Preferences.getUI("ProxyType/Ftp")
)
- if proxyType != E5FtpProxyType.NO_PROXY:
+ if proxyType != EricFtpProxyType.NO_PROXY:
self.__ftp.setProxy(
proxyType,
Preferences.getUI("ProxyHost/Ftp"),
Preferences.getUI("ProxyPort/Ftp"))
- if proxyType != E5FtpProxyType.NON_AUTHORIZING:
+ if proxyType != EricFtpProxyType.NON_AUTHORIZING:
self.__ftp.setProxyAuthentication(
Preferences.getUI("ProxyUser/Ftp"),
Preferences.getUI("ProxyPassword/Ftp"),
@@ -114,7 +114,7 @@
self.__initialSync()
self.__state = "idle"
self.__idleTimer.start()
- except (ftplib.all_errors + (E5FtpProxyError,)) as err:
+ except (ftplib.all_errors + (EricFtpProxyError,)) as err:
self.syncError.emit(str(err))
def __connectAndLogin(self):
