diff -r 960850ec284c -r a22eee00b052 eric6/Plugins/VcsPlugins/vcsGit/GitStatusDialog.py
--- a/eric6/Plugins/VcsPlugins/vcsGit/GitStatusDialog.py Sat Aug 31 12:29:57 2019 +0200
+++ b/eric6/Plugins/VcsPlugins/vcsGit/GitStatusDialog.py Sat Aug 31 12:58:11 2019 +0200
@@ -9,10 +9,6 @@
"""
from __future__ import unicode_literals
-try:
- str = unicode
-except NameError:
- pass
import os
import tempfile
@@ -25,14 +21,13 @@
from E5Gui.E5Application import e5App
from E5Gui import E5MessageBox
-from Globals import qVersionTuple
+from Globals import qVersionTuple, strToQByteArray
from .Ui_GitStatusDialog import Ui_GitStatusDialog
from .GitDiffHighlighter import GitDiffHighlighter
from .GitDiffGenerator import GitDiffGenerator
from .GitDiffParser import GitDiffParser
-from .GitUtilities import strToQByteArray
import Preferences
import UI.PixmapCache
