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