Mercurial Repositories > eric / file comparison
comparison: Helpviewer/UserAgent/UserAgentManager.py
Helpviewer/UserAgent/UserAgentManager.py
- branch
- Py2 comp.
- changeset 3058
- 0a02c433f52d
- parent 3057
- 10516539f238
- parent 3020
- 542e97d4ecb3
- child 3060
- 5883ce99ee12
equal
deleted
inserted
replaced
| 3057:10516539f238 | 3058:0a02c433f52d |
|---|---|
| 63 | 63 |
| 64 from .UserAgentWriter import UserAgentWriter | 64 from .UserAgentWriter import UserAgentWriter |
| 65 agentFile = self.getFileName() | 65 agentFile = self.getFileName() |
| 66 writer = UserAgentWriter() | 66 writer = UserAgentWriter() |
| 67 if not writer.write(agentFile, self.__agents): | 67 if not writer.write(agentFile, self.__agents): |
| 68 E5MessageBox.critical(None, | 68 E5MessageBox.critical( |
| 69 None, | |
| 69 self.trUtf8("Saving user agent data"), | 70 self.trUtf8("Saving user agent data"), |
| 70 self.trUtf8( | 71 self.trUtf8( |
| 71 """<p>User agent data could not be saved to""" | 72 """<p>User agent data could not be saved to""" |
| 72 """ <b>{0}</b></p>""").format(agentFile)) | 73 """ <b>{0}</b></p>""").format(agentFile)) |
| 73 else: | 74 else: |
| 83 else: | 84 else: |
| 84 from .UserAgentReader import UserAgentReader | 85 from .UserAgentReader import UserAgentReader |
| 85 reader = UserAgentReader() | 86 reader = UserAgentReader() |
| 86 self.__agents = reader.read(agentFile) | 87 self.__agents = reader.read(agentFile) |
| 87 if reader.error() != QXmlStreamReader.NoError: | 88 if reader.error() != QXmlStreamReader.NoError: |
| 88 E5MessageBox.warning(None, | 89 E5MessageBox.warning( |
| 90 None, | |
| 89 self.trUtf8("Loading user agent data"), | 91 self.trUtf8("Loading user agent data"), |
| 90 self.trUtf8("""Error when loading user agent data on""" | 92 self.trUtf8("""Error when loading user agent data on""" |
| 91 """ line {0}, column {1}:\n{2}""")\ | 93 """ line {0}, column {1}:\n{2}""")\ |
| 92 .format(reader.lineNumber(), | 94 .format(reader.lineNumber(), |
| 93 reader.columnNumber(), | 95 reader.columnNumber(), |
| 108 try: | 110 try: |
| 109 f = open(agentFile, "r", encoding="utf-8") | 111 f = open(agentFile, "r", encoding="utf-8") |
| 110 lines = f.read() | 112 lines = f.read() |
| 111 f.close() | 113 f.close() |
| 112 except IOError as err: | 114 except IOError as err: |
| 113 E5MessageBox.critical(None, | 115 E5MessageBox.critical( |
| 116 None, | |
| 114 self.trUtf8("Loading user agent data"), | 117 self.trUtf8("Loading user agent data"), |
| 115 self.trUtf8("""<p>User agent data could not be loaded """ | 118 self.trUtf8("""<p>User agent data could not be loaded """ |
| 116 """from <b>{0}</b></p>""" | 119 """from <b>{0}</b></p>""" |
| 117 """<p>Reason: {1}</p>""")\ | 120 """<p>Reason: {1}</p>""")\ |
| 118 .format(agentFile, str(err))) | 121 .format(agentFile, str(err))) |
