Mercurial Repositories > eric / file comparison
comparison: Helpviewer/UserAgent/UserAgentManager.py
Helpviewer/UserAgent/UserAgentManager.py
- branch
- Py2 comp.
- changeset 3060
- 5883ce99ee12
- parent 3058
- 0a02c433f52d
- parent 3035
- 36e9f388958b
- child 3145
- a9de05d4a22f
equal
deleted
inserted
replaced
| 3058:0a02c433f52d | 3060:5883ce99ee12 |
|---|---|
| 88 if reader.error() != QXmlStreamReader.NoError: | 88 if reader.error() != QXmlStreamReader.NoError: |
| 89 E5MessageBox.warning( | 89 E5MessageBox.warning( |
| 90 None, | 90 None, |
| 91 self.trUtf8("Loading user agent data"), | 91 self.trUtf8("Loading user agent data"), |
| 92 self.trUtf8("""Error when loading user agent data on""" | 92 self.trUtf8("""Error when loading user agent data on""" |
| 93 """ line {0}, column {1}:\n{2}""")\ | 93 """ line {0}, column {1}:\n{2}""") |
| 94 .format(reader.lineNumber(), | 94 .format(reader.lineNumber(), |
| 95 reader.columnNumber(), | 95 reader.columnNumber(), |
| 96 reader.errorString())) | 96 reader.errorString())) |
| 97 | 97 |
| 98 self.__loaded = True | 98 self.__loaded = True |
| 99 | 99 |
| 100 def __loadNonXml(self, agentFile): | 100 def __loadNonXml(self, agentFile): |
| 101 """ | 101 """ |
| 115 E5MessageBox.critical( | 115 E5MessageBox.critical( |
| 116 None, | 116 None, |
| 117 self.trUtf8("Loading user agent data"), | 117 self.trUtf8("Loading user agent data"), |
| 118 self.trUtf8("""<p>User agent data could not be loaded """ | 118 self.trUtf8("""<p>User agent data could not be loaded """ |
| 119 """from <b>{0}</b></p>""" | 119 """from <b>{0}</b></p>""" |
| 120 """<p>Reason: {1}</p>""")\ | 120 """<p>Reason: {1}</p>""") |
| 121 .format(agentFile, str(err))) | 121 .format(agentFile, str(err))) |
| 122 return | 122 return |
| 123 | 123 |
| 124 for line in lines.splitlines(): | 124 for line in lines.splitlines(): |
| 125 if not line or \ | 125 if not line or \ |
| 126 line.startswith("#") or \ | 126 line.startswith("#") or \ |
