Mercurial Repositories > eric / file comparison
comparison: UI/DiffDialog.py
UI/DiffDialog.py
- changeset 42
- 23b45a742e17
- parent 13
- 1af94a91f439
- child 45
- 9a18f4dbb493
equal
deleted
inserted
replaced
| 41:572a009369f0 | 42:23b45a742e17 |
|---|---|
| 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, "rb") | 327 f1 = open(self.filename1, "r") |
| 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, "rb") | 343 f2 = open(self.filename2, "r") |
| 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"), |
| 475 """ | 475 """ |
| 476 Private slot to handle the file 1 file selection button press. | 476 Private slot to handle the file 1 file selection button press. |
| 477 """ | 477 """ |
| 478 self.__selectFile(self.file1Edit) | 478 self.__selectFile(self.file1Edit) |
| 479 | 479 |
| 480 @pyqtSlot("") | 480 @pyqtSlot() |
| 481 def on_file2Button_clicked(self): | 481 def on_file2Button_clicked(self): |
| 482 """ | 482 """ |
| 483 Private slot to handle the file 2 file selection button press. | 483 Private slot to handle the file 2 file selection button press. |
| 484 """ | 484 """ |
| 485 self.__selectFile(self.file2Edit) | 485 self.__selectFile(self.file2Edit) |
