Mercurial Repositories > eric / file comparison
comparison: Helpviewer/Network/NetworkAccessManager.py
Helpviewer/Network/NetworkAccessManager.py
- changeset 2094
- 88620e11c67c
- parent 2080
- 4b33165dd55b
- child 2302
- f29e9405c851
equal
deleted
inserted
replaced
| 2089:d23ab571d2b9 | 2094:88620e11c67c |
|---|---|
| 240 errorStrings = [] | 240 errorStrings = [] |
| 241 url = reply.url() | 241 url = reply.url() |
| 242 server = url.host() | 242 server = url.host() |
| 243 if url.port() != -1: | 243 if url.port() != -1: |
| 244 server += ":{0:d}".format(url.port()) | 244 server += ":{0:d}".format(url.port()) |
| 245 for err in errors: | 245 if errors: |
| 246 if err.error() == QSslError.NoError: | 246 for err in errors: |
| 247 continue | 247 if err.error() == QSslError.NoError: |
| 248 if server in caMerge and err.certificate() in caMerge[server]: | 248 continue |
| 249 continue | 249 if server in caMerge and err.certificate() in caMerge[server]: |
| 250 errorStrings.append(err.errorString()) | 250 continue |
| 251 if not err.certificate().isNull(): | 251 errorStrings.append(err.errorString()) |
| 252 cert = err.certificate() | 252 if not err.certificate().isNull(): |
| 253 if cert not in caNew: | 253 cert = err.certificate() |
| 254 caNew.append(cert) | 254 if cert not in caNew: |
| 255 caNew.append(cert) | |
| 255 if not errorStrings: | 256 if not errorStrings: |
| 256 reply.ignoreSslErrors() | 257 reply.ignoreSslErrors() |
| 257 return | 258 return |
| 258 | 259 |
| 259 errorString = '.</li><li>'.join(errorStrings) | 260 errorString = '.</li><li>'.join(errorStrings) |
