Mercurial Repositories > eric / file comparison
comparison: E5Network/E5SslErrorHandler.py
E5Network/E5SslErrorHandler.py
- branch
- Py2 comp.
- changeset 3058
- 0a02c433f52d
- parent 3057
- 10516539f238
- parent 3022
- 57179e4cdadd
- child 3060
- 5883ce99ee12
equal
deleted
inserted
replaced
| 3057:10516539f238 | 3058:0a02c433f52d |
|---|---|
| 41 caList = self.__getSystemCaCertificates() | 41 caList = self.__getSystemCaCertificates() |
| 42 if Preferences.Prefs.settings.contains("Help/CaCertificatesDict"): | 42 if Preferences.Prefs.settings.contains("Help/CaCertificatesDict"): |
| 43 # port old entries stored under 'Help' | 43 # port old entries stored under 'Help' |
| 44 certificateDict = Preferences.toDict( | 44 certificateDict = Preferences.toDict( |
| 45 Preferences.Prefs.settings.value("Help/CaCertificatesDict")) | 45 Preferences.Prefs.settings.value("Help/CaCertificatesDict")) |
| 46 Preferences.Prefs.settings.setValue("Ssl/CaCertificatesDict", | 46 Preferences.Prefs.settings.setValue( |
| 47 certificateDict) | 47 "Ssl/CaCertificatesDict", certificateDict) |
| 48 Preferences.Prefs.settings.remove("Help/CaCertificatesDict") | 48 Preferences.Prefs.settings.remove("Help/CaCertificatesDict") |
| 49 else: | 49 else: |
| 50 certificateDict = Preferences.toDict( | 50 certificateDict = Preferences.toDict( |
| 51 Preferences.Prefs.settings.value("Ssl/CaCertificatesDict")) | 51 Preferences.Prefs.settings.value("Ssl/CaCertificatesDict")) |
| 52 for server in certificateDict: | 52 for server in certificateDict: |
| 128 caNew.append(cert) | 128 caNew.append(cert) |
| 129 if not errorStrings: | 129 if not errorStrings: |
| 130 return E5SslErrorHandler.SystemIgnored, False | 130 return E5SslErrorHandler.SystemIgnored, False |
| 131 | 131 |
| 132 errorString = '.</li><li>'.join(errorStrings) | 132 errorString = '.</li><li>'.join(errorStrings) |
| 133 ret = E5MessageBox.yesNo(None, | 133 ret = E5MessageBox.yesNo( |
| 134 None, | |
| 134 self.trUtf8("SSL Errors"), | 135 self.trUtf8("SSL Errors"), |
| 135 self.trUtf8("""<p>SSL Errors for <br /><b>{0}</b>""" | 136 self.trUtf8("""<p>SSL Errors for <br /><b>{0}</b>""" |
| 136 """<ul><li>{1}</li></ul></p>""" | 137 """<ul><li>{1}</li></ul></p>""" |
| 137 """<p>Do you want to ignore these errors?</p>""")\ | 138 """<p>Do you want to ignore these errors?</p>""")\ |
| 138 .format(server, errorString), | 139 .format(server, errorString), |
| 142 caRet = False | 143 caRet = False |
| 143 if len(caNew) > 0: | 144 if len(caNew) > 0: |
| 144 certinfos = [] | 145 certinfos = [] |
| 145 for cert in caNew: | 146 for cert in caNew: |
| 146 certinfos.append(self.__certToString(cert)) | 147 certinfos.append(self.__certToString(cert)) |
| 147 caRet = E5MessageBox.yesNo(None, | 148 caRet = E5MessageBox.yesNo( |
| 149 None, | |
| 148 self.trUtf8("Certificates"), | 150 self.trUtf8("Certificates"), |
| 149 self.trUtf8( | 151 self.trUtf8( |
| 150 """<p>Certificates:<br/>{0}<br/>""" | 152 """<p>Certificates:<br/>{0}<br/>""" |
| 151 """Do you want to accept all these certificates?""" | 153 """Do you want to accept all these certificates?""" |
| 152 """</p>""")\ | 154 """</p>""")\ |
