Mercurial Repositories > eric / file comparison
comparison: Helpviewer/Network/NetworkAccessManager.py
Helpviewer/Network/NetworkAccessManager.py
- changeset 3656
- 441956d8fce5
- parent 3591
- 2f2a4a76dd22
- child 3670
- f0cb7579c0b4
equal
deleted
inserted
replaced
| 3654:ffeb85cdc72d | 3656:441956d8fce5 |
|---|---|
| 9 | 9 |
| 10 from __future__ import unicode_literals | 10 from __future__ import unicode_literals |
| 11 | 11 |
| 12 import os | 12 import os |
| 13 | 13 |
| 14 from PyQt4.QtCore import pyqtSignal, QByteArray, qVersion | 14 from PyQt5.QtCore import pyqtSignal, QByteArray, qVersion |
| 15 from PyQt4.QtGui import QDialog | 15 from PyQt5.QtWidgets import QDialog |
| 16 from PyQt4.QtNetwork import QNetworkAccessManager, QNetworkRequest, \ | 16 from PyQt5.QtNetwork import QNetworkAccessManager, QNetworkRequest, \ |
| 17 QNetworkReply | 17 QNetworkReply |
| 18 | 18 |
| 19 from E5Network.E5NetworkProxyFactory import E5NetworkProxyFactory, \ | 19 from E5Network.E5NetworkProxyFactory import E5NetworkProxyFactory, \ |
| 20 proxyAuthenticationRequired | 20 proxyAuthenticationRequired |
| 21 try: | 21 try: |
| 22 from PyQt4.QtNetwork import QSslSocket | 22 from PyQt5.QtNetwork import QSslSocket |
| 23 from E5Network.E5SslErrorHandler import E5SslErrorHandler | 23 from E5Network.E5SslErrorHandler import E5SslErrorHandler |
| 24 SSL_AVAILABLE = True | 24 SSL_AVAILABLE = True |
| 25 except ImportError: | 25 except ImportError: |
| 26 SSL_AVAILABLE = False | 26 SSL_AVAILABLE = False |
| 27 | 27 |
| 259 def __setDiskCache(self): | 259 def __setDiskCache(self): |
| 260 """ | 260 """ |
| 261 Private method to set the disk cache. | 261 Private method to set the disk cache. |
| 262 """ | 262 """ |
| 263 if Preferences.getHelp("DiskCacheEnabled"): | 263 if Preferences.getHelp("DiskCacheEnabled"): |
| 264 from PyQt4.QtWebKit import qWebKitVersion | 264 from PyQt5.QtWebKit import qWebKitVersion |
| 265 from .NetworkDiskCache import NetworkDiskCache | 265 from .NetworkDiskCache import NetworkDiskCache |
| 266 diskCache = NetworkDiskCache(self) | 266 diskCache = NetworkDiskCache(self) |
| 267 location = os.path.join( | 267 location = os.path.join( |
| 268 Utilities.getConfigDir(), "browser", 'cache', | 268 Utilities.getConfigDir(), "browser", 'cache', |
| 269 "{0}-Qt{1}".format(qWebKitVersion(), qVersion())) | 269 "{0}-Qt{1}".format(qWebKitVersion(), qVersion())) |
