Mercurial Repositories > eric / file comparison
comparison: Helpviewer/HelpBrowserWV.py
Helpviewer/HelpBrowserWV.py
- branch
- 6_0_x
- changeset 4243
- 617a83ed2204
- parent 4022
- f5f42921717e
- child 4275
- 3bed5f74d328
equal
deleted
inserted
replaced
| 4240:171caaf2dac2 | 4243:617a83ed2204 |
|---|---|
| 33 | 33 |
| 34 from E5Gui import E5MessageBox, E5FileDialog | 34 from E5Gui import E5MessageBox, E5FileDialog |
| 35 | 35 |
| 36 import Preferences | 36 import Preferences |
| 37 import UI.PixmapCache | 37 import UI.PixmapCache |
| 38 import Globals | |
| 38 | 39 |
| 39 try: | 40 try: |
| 40 from PyQt5.QtNetwork import QSslCertificate | 41 from PyQt5.QtNetwork import QSslCertificate |
| 41 SSL_AVAILABLE = True | 42 SSL_AVAILABLE = True |
| 42 except ImportError: | 43 except ImportError: |
| 565 | 566 |
| 566 certList = self.__sslConfiguration.peerCertificateChain() | 567 certList = self.__sslConfiguration.peerCertificateChain() |
| 567 if not certList: | 568 if not certList: |
| 568 return False | 569 return False |
| 569 | 570 |
| 570 certificateDict = Preferences.toDict( | 571 certificateDict = Globals.toDict( |
| 571 Preferences.Prefs.settings.value("Ssl/CaCertificatesDict")) | 572 Preferences.Prefs.settings.value("Ssl/CaCertificatesDict")) |
| 572 for server in certificateDict: | 573 for server in certificateDict: |
| 573 localCAList = QSslCertificate.fromData(certificateDict[server]) | 574 localCAList = QSslCertificate.fromData(certificateDict[server]) |
| 574 for cert in certList: | 575 for cert in certList: |
| 575 if cert in localCAList: | 576 if cert in localCAList: |
