Mercurial Repositories > eric / file comparison
comparison: src/eric7/WebBrowser/Sync/FtpSyncHandler.py
src/eric7/WebBrowser/Sync/FtpSyncHandler.py
- branch
- eric7
- changeset 10928
- 46651e194fbe
- parent 10683
- 779cda568acb
- child 11090
- f5f5f5803935
equal
deleted
inserted
replaced
| 10927:ce599998be7d | 10928:46651e194fbe |
|---|---|
| 13 import pathlib | 13 import pathlib |
| 14 | 14 |
| 15 from PyQt6.QtCore import QByteArray, QCoreApplication, QTimer, pyqtSignal | 15 from PyQt6.QtCore import QByteArray, QCoreApplication, QTimer, pyqtSignal |
| 16 | 16 |
| 17 from eric7 import Preferences | 17 from eric7 import Preferences |
| 18 from eric7.EricCore import EricPreferences | |
| 18 from eric7.EricNetwork.EricFtp import EricFtp, EricFtpProxyError, EricFtpProxyType | 19 from eric7.EricNetwork.EricFtp import EricFtp, EricFtpProxyError, EricFtpProxyType |
| 19 from eric7.Utilities.FtpUtilities import FtpDirLineParser, FtpDirLineParserError | 20 from eric7.Utilities.FtpUtilities import FtpDirLineParser, FtpDirLineParserError |
| 20 from eric7.WebBrowser.WebBrowserWindow import WebBrowserWindow | 21 from eric7.WebBrowser.WebBrowserWindow import WebBrowserWindow |
| 21 | 22 |
| 22 from .SyncHandler import SyncHandler | 23 from .SyncHandler import SyncHandler |
| 78 self.__ftp = EricFtp() | 79 self.__ftp = EricFtp() |
| 79 | 80 |
| 80 # do proxy setup | 81 # do proxy setup |
| 81 proxyType = ( | 82 proxyType = ( |
| 82 EricFtpProxyType.NO_PROXY | 83 EricFtpProxyType.NO_PROXY |
| 83 if not Preferences.getUI("UseProxy") | 84 if not EricPreferences.getNetworkProxy("UseProxy") |
| 84 else Preferences.getUI("ProxyType/Ftp") | 85 else EricPreferences.getNetworkProxy("ProxyType/Ftp") |
| 85 ) | 86 ) |
| 86 if proxyType != EricFtpProxyType.NO_PROXY: | 87 if proxyType != EricFtpProxyType.NO_PROXY: |
| 87 self.__ftp.setProxy( | 88 self.__ftp.setProxy( |
| 88 proxyType, | 89 proxyType, |
| 89 Preferences.getUI("ProxyHost/Ftp"), | 90 EricPreferences.getNetworkProxy("ProxyHost/Ftp"), |
| 90 Preferences.getUI("ProxyPort/Ftp"), | 91 EricPreferences.getNetworkProxy("ProxyPort/Ftp"), |
| 91 ) | 92 ) |
| 92 if proxyType != EricFtpProxyType.NON_AUTHORIZING: | 93 if proxyType != EricFtpProxyType.NON_AUTHORIZING: |
| 93 self.__ftp.setProxyAuthentication( | 94 self.__ftp.setProxyAuthentication( |
| 94 Preferences.getUI("ProxyUser/Ftp"), | 95 EricPreferences.getNetworkProxy("ProxyUser/Ftp"), |
| 95 Preferences.getUI("ProxyPassword/Ftp"), | 96 EricPreferences.getNetworkProxy("ProxyPassword/Ftp"), |
| 96 Preferences.getUI("ProxyAccount/Ftp"), | 97 EricPreferences.getNetworkProxy("ProxyAccount/Ftp"), |
| 97 ) | 98 ) |
| 98 | 99 |
| 99 QTimer.singleShot(0, self.__doFtpCommands) | 100 QTimer.singleShot(0, self.__doFtpCommands) |
| 100 | 101 |
| 101 def __doFtpCommands(self): | 102 def __doFtpCommands(self): |
