Mercurial Repositories > eric / file comparison
comparison: UI/CompareDialog.py
UI/CompareDialog.py
- branch
- Py2 comp.
- changeset 3141
- 72f3bde98c58
- parent 3060
- 5883ce99ee12
- child 3145
- a9de05d4a22f
equal
deleted
inserted
replaced
| 3127:e47a9d5954e8 | 3141:72f3bde98c58 |
|---|---|
| 7 Module implementing a dialog to compare two files and show the result side by | 7 Module implementing a dialog to compare two files and show the result side by |
| 8 side. | 8 side. |
| 9 """ | 9 """ |
| 10 | 10 |
| 11 from __future__ import unicode_literals # __IGNORE_WARNING__ | 11 from __future__ import unicode_literals # __IGNORE_WARNING__ |
| 12 try: | |
| 13 basestring # __IGNORE_WARNING__ | |
| 14 except NameError: | |
| 15 basestring = str | |
| 12 | 16 |
| 13 import re | 17 import re |
| 14 from difflib import _mdiff, IS_CHARACTER_JUNK | 18 from difflib import _mdiff, IS_CHARACTER_JUNK |
| 15 | 19 |
| 16 from PyQt4.QtCore import QTimer, QEvent, pyqtSlot | 20 from PyQt4.QtCore import QTimer, QEvent, pyqtSlot |
| 274 self.file2Edit.setText(name2) | 278 self.file2Edit.setText(name2) |
| 275 self.file2Edit.setReadOnly(True) | 279 self.file2Edit.setReadOnly(True) |
| 276 self.diffButton.setEnabled(False) | 280 self.diffButton.setEnabled(False) |
| 277 self.diffButton.hide() | 281 self.diffButton.hide() |
| 278 | 282 |
| 279 if isinstance(lines1, str): | 283 if isinstance(lines1, basestring): |
| 280 lines1 = lines1.splitlines(True) | 284 lines1 = lines1.splitlines(True) |
| 281 if isinstance(lines2, str): | 285 if isinstance(lines2, basestring): |
| 282 lines2 = lines2.splitlines(True) | 286 lines2 = lines2.splitlines(True) |
| 283 | 287 |
| 284 self.__compare(lines1, lines2) | 288 self.__compare(lines1, lines2) |
| 285 | 289 |
| 286 def __compare(self, lines1, lines2): | 290 def __compare(self, lines1, lines2): |
