Mercurial Repositories > eric / file comparison
comparison: eric6/Plugins/VcsPlugins/vcsGit/GitBlameDialog.py
eric6/Plugins/VcsPlugins/vcsGit/GitBlameDialog.py
- branch
- without_py2_and_pyqt4
- changeset 7192
- a22eee00b052
- parent 6942
- 2602857055c5
- child 7229
- 53054eb5b15a
equal
deleted
inserted
replaced
| 7191:960850ec284c | 7192:a22eee00b052 |
|---|---|
| 6 """ | 6 """ |
| 7 Module implementing a dialog to show the output of git blame. | 7 Module implementing a dialog to show the output of git blame. |
| 8 """ | 8 """ |
| 9 | 9 |
| 10 from __future__ import unicode_literals | 10 from __future__ import unicode_literals |
| 11 try: | |
| 12 str = unicode | |
| 13 except NameError: | |
| 14 pass | |
| 15 | 11 |
| 16 import os | 12 import os |
| 17 import re | 13 import re |
| 18 | 14 |
| 19 from PyQt5.QtCore import pyqtSlot, QProcess, QTimer, Qt, QCoreApplication | 15 from PyQt5.QtCore import pyqtSlot, QProcess, QTimer, Qt, QCoreApplication |
| 22 | 18 |
| 23 from E5Gui import E5MessageBox | 19 from E5Gui import E5MessageBox |
| 24 | 20 |
| 25 from .Ui_GitBlameDialog import Ui_GitBlameDialog | 21 from .Ui_GitBlameDialog import Ui_GitBlameDialog |
| 26 | 22 |
| 27 from .GitUtilities import strToQByteArray | |
| 28 | |
| 29 import Preferences | 23 import Preferences |
| 24 from Globals import strToQByteArray | |
| 30 | 25 |
| 31 | 26 |
| 32 class GitBlameDialog(QDialog, Ui_GitBlameDialog): | 27 class GitBlameDialog(QDialog, Ui_GitBlameDialog): |
| 33 """ | 28 """ |
| 34 Class implementing a dialog to show the output of git blame. | 29 Class implementing a dialog to show the output of git blame. |
