Mercurial Repositories > eric / file comparison
comparison: eric7/UI/DiffDialog.py
eric7/UI/DiffDialog.py
- branch
- eric7
- changeset 8318
- 962bce857696
- parent 8312
- 800c432b34c8
- child 8322
- b422b4e77d19
equal
deleted
inserted
replaced
| 8316:0c7a44af84bc | 8318:962bce857696 |
|---|---|
| 10 import os | 10 import os |
| 11 import time | 11 import time |
| 12 import contextlib | 12 import contextlib |
| 13 from difflib import unified_diff, context_diff | 13 from difflib import unified_diff, context_diff |
| 14 | 14 |
| 15 from PyQt5.QtCore import QFileInfo, QEvent, pyqtSlot | 15 from PyQt6.QtCore import QFileInfo, QEvent, pyqtSlot |
| 16 from PyQt5.QtGui import QTextCursor | 16 from PyQt6.QtGui import QTextCursor |
| 17 from PyQt5.QtWidgets import QWidget, QApplication, QDialogButtonBox | 17 from PyQt6.QtWidgets import QWidget, QApplication, QDialogButtonBox |
| 18 | 18 |
| 19 from E5Gui import E5MessageBox, E5FileDialog | 19 from E5Gui import E5MessageBox, E5FileDialog |
| 20 from E5Gui.E5MainWindow import E5MainWindow | 20 from E5Gui.E5MainWindow import E5MainWindow |
| 21 from E5Gui.E5PathPicker import E5PathPickerModes | 21 from E5Gui.E5PathPicker import E5PathPickerModes |
| 22 | 22 |
