Mercurial Repositories > eric / file comparison
comparison: Helpviewer/UserAgent/UserAgentManager.py
Helpviewer/UserAgent/UserAgentManager.py
- changeset 3034
- 7ce719013078
- parent 3020
- 542e97d4ecb3
- child 3035
- 36e9f388958b
equal
deleted
inserted
replaced
| 3033:58fe260e7469 | 3034:7ce719013078 |
|---|---|
| 86 if reader.error() != QXmlStreamReader.NoError: | 86 if reader.error() != QXmlStreamReader.NoError: |
| 87 E5MessageBox.warning( | 87 E5MessageBox.warning( |
| 88 None, | 88 None, |
| 89 self.trUtf8("Loading user agent data"), | 89 self.trUtf8("Loading user agent data"), |
| 90 self.trUtf8("""Error when loading user agent data on""" | 90 self.trUtf8("""Error when loading user agent data on""" |
| 91 """ line {0}, column {1}:\n{2}""")\ | 91 """ line {0}, column {1}:\n{2}""") |
| 92 .format(reader.lineNumber(), | 92 .format(reader.lineNumber(), |
| 93 reader.columnNumber(), | 93 reader.columnNumber(), |
| 94 reader.errorString())) | 94 reader.errorString())) |
| 95 | 95 |
| 96 self.__loaded = True | 96 self.__loaded = True |
| 113 E5MessageBox.critical( | 113 E5MessageBox.critical( |
| 114 None, | 114 None, |
| 115 self.trUtf8("Loading user agent data"), | 115 self.trUtf8("Loading user agent data"), |
| 116 self.trUtf8("""<p>User agent data could not be loaded """ | 116 self.trUtf8("""<p>User agent data could not be loaded """ |
| 117 """from <b>{0}</b></p>""" | 117 """from <b>{0}</b></p>""" |
| 118 """<p>Reason: {1}</p>""")\ | 118 """<p>Reason: {1}</p>""") |
| 119 .format(agentFile, str(err))) | 119 .format(agentFile, str(err))) |
| 120 return | 120 return |
| 121 | 121 |
| 122 for line in lines.splitlines(): | 122 for line in lines.splitlines(): |
| 123 if not line or \ | 123 if not line or \ |
