Mercurial Repositories > eric / file comparison
comparison: UI/CompareDialog.py
UI/CompareDialog.py
- changeset 3020
- 542e97d4ecb3
- parent 3012
- d177226027e2
- child 3030
- 4a0a82ddd9d2
equal
deleted
inserted
replaced
| 3019:7912530a33e2 | 3020:542e97d4ecb3 |
|---|---|
| 227 try: | 227 try: |
| 228 f1 = open(filename1, "r", encoding="utf-8") | 228 f1 = open(filename1, "r", encoding="utf-8") |
| 229 lines1 = f1.readlines() | 229 lines1 = f1.readlines() |
| 230 f1.close() | 230 f1.close() |
| 231 except IOError: | 231 except IOError: |
| 232 E5MessageBox.critical(self, | 232 E5MessageBox.critical( |
| 233 self, | |
| 233 self.trUtf8("Compare Files"), | 234 self.trUtf8("Compare Files"), |
| 234 self.trUtf8( | 235 self.trUtf8( |
| 235 """<p>The file <b>{0}</b> could not be read.</p>""") | 236 """<p>The file <b>{0}</b> could not be read.</p>""") |
| 236 .format(filename1)) | 237 .format(filename1)) |
| 237 return | 238 return |
| 240 try: | 241 try: |
| 241 f2 = open(filename2, "r", encoding="utf-8") | 242 f2 = open(filename2, "r", encoding="utf-8") |
| 242 lines2 = f2.readlines() | 243 lines2 = f2.readlines() |
| 243 f2.close() | 244 f2.close() |
| 244 except IOError: | 245 except IOError: |
| 245 E5MessageBox.critical(self, | 246 E5MessageBox.critical( |
| 247 self, | |
| 246 self.trUtf8("Compare Files"), | 248 self.trUtf8("Compare Files"), |
| 247 self.trUtf8( | 249 self.trUtf8( |
| 248 """<p>The file <b>{0}</b> could not be read.</p>""") | 250 """<p>The file <b>{0}</b> could not be read.</p>""") |
| 249 .format(filename2)) | 251 .format(filename2)) |
| 250 return | 252 return |
