Mercurial Repositories > eric / file comparison
comparison: UI/CompareDialog.py
UI/CompareDialog.py
- changeset 3656
- 441956d8fce5
- parent 3484
- 645c12de6b0c
- child 4021
- 195a471c327b
equal
deleted
inserted
replaced
| 3654:ffeb85cdc72d | 3656:441956d8fce5 |
|---|---|
| 15 basestring = str | 15 basestring = str |
| 16 | 16 |
| 17 import re | 17 import re |
| 18 from difflib import _mdiff, IS_CHARACTER_JUNK | 18 from difflib import _mdiff, IS_CHARACTER_JUNK |
| 19 | 19 |
| 20 from PyQt4.QtCore import QTimer, QEvent, pyqtSlot | 20 from PyQt5.QtCore import QTimer, QEvent, pyqtSlot |
| 21 from PyQt4.QtGui import QWidget, QColor, QFontMetrics, QBrush, QApplication, \ | 21 from PyQt5.QtGui import QColor, QFontMetrics, QBrush, QTextCursor |
| 22 QTextCursor, QDialogButtonBox | 22 from PyQt5.QtWidgets import QWidget, QApplication, QDialogButtonBox |
| 23 | 23 |
| 24 from E5Gui.E5Completers import E5FileCompleter | 24 from E5Gui.E5Completers import E5FileCompleter |
| 25 from E5Gui import E5MessageBox, E5FileDialog | 25 from E5Gui import E5MessageBox, E5FileDialog |
| 26 from E5Gui.E5MainWindow import E5MainWindow | 26 from E5Gui.E5MainWindow import E5MainWindow |
| 27 | 27 |
