diff -r 960850ec284c -r a22eee00b052 eric6/Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py --- a/eric6/Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py Sat Aug 31 12:29:57 2019 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py Sat Aug 31 12:58:11 2019 +0200 @@ -8,10 +8,6 @@ """ from __future__ import unicode_literals -try: - str = unicode -except NameError: - pass import os import collections @@ -26,13 +22,12 @@ from E5Gui.E5Application import e5App from E5Gui import E5MessageBox, E5FileDialog -from Globals import qVersionTuple +from Globals import qVersionTuple, strToQByteArray from .Ui_GitLogBrowserDialog import Ui_GitLogBrowserDialog from .GitDiffHighlighter import GitDiffHighlighter from .GitDiffGenerator import GitDiffGenerator -from .GitUtilities import strToQByteArray import UI.PixmapCache import Preferences