Mercurial Repositories > eric / file comparison
comparison: UI/DiffDialog.py
UI/DiffDialog.py
- changeset 45
- 9a18f4dbb493
- parent 42
- 23b45a742e17
- child 55
- b5c84934de9c
equal
deleted
inserted
replaced
| 44:fe5cd20cb0eb | 45:9a18f4dbb493 |
|---|---|
| 298 if res != QMessageBox.Save: | 298 if res != QMessageBox.Save: |
| 299 return | 299 return |
| 300 fname = Utilities.toNativeSeparators(fname) | 300 fname = Utilities.toNativeSeparators(fname) |
| 301 | 301 |
| 302 try: | 302 try: |
| 303 f = open(fname, "w") | 303 f = open(fname, "w", encoding = "utf-8") |
| 304 txt = self.contents.toPlainText() | 304 txt = self.contents.toPlainText() |
| 305 try: | 305 try: |
| 306 f.write(txt) | 306 f.write(txt) |
| 307 except UnicodeError: | 307 except UnicodeError: |
| 308 pass | 308 pass |
| 322 try: | 322 try: |
| 323 filemtime1 = time.ctime(os.stat(self.filename1).st_mtime) | 323 filemtime1 = time.ctime(os.stat(self.filename1).st_mtime) |
| 324 except IOError: | 324 except IOError: |
| 325 filemtime1 = "" | 325 filemtime1 = "" |
| 326 try: | 326 try: |
| 327 f1 = open(self.filename1, "r") | 327 f1 = open(self.filename1, "r", encoding = "utf-8") |
| 328 lines1 = f1.readlines() | 328 lines1 = f1.readlines() |
| 329 f1.close() | 329 f1.close() |
| 330 except IOError: | 330 except IOError: |
| 331 QMessageBox.critical(self, | 331 QMessageBox.critical(self, |
| 332 self.trUtf8("Compare Files"), | 332 self.trUtf8("Compare Files"), |
| 338 try: | 338 try: |
| 339 filemtime2 = time.ctime(os.stat(self.filename2).st_mtime) | 339 filemtime2 = time.ctime(os.stat(self.filename2).st_mtime) |
| 340 except IOError: | 340 except IOError: |
| 341 filemtime2 = "" | 341 filemtime2 = "" |
| 342 try: | 342 try: |
| 343 f2 = open(self.filename2, "r") | 343 f2 = open(self.filename2, "r", encoding = "utf-8") |
| 344 lines2 = f2.readlines() | 344 lines2 = f2.readlines() |
| 345 f2.close() | 345 f2.close() |
| 346 except IOError: | 346 except IOError: |
| 347 QMessageBox.critical(self, | 347 QMessageBox.critical(self, |
| 348 self.trUtf8("Compare Files"), | 348 self.trUtf8("Compare Files"), |
