diff -r 960850ec284c -r a22eee00b052 eric6/Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py
--- a/eric6/Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py Sat Aug 31 12:29:57 2019 +0200
+++ b/eric6/Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py Sat Aug 31 12:58:11 2019 +0200
@@ -11,7 +11,6 @@
from __future__ import unicode_literals
import os
-import sys
import pysvn
@@ -224,8 +223,6 @@
diff_list = []
for diff_sum in diff_summary:
path = diff_sum['path']
- if sys.version_info[0] == 2:
- path = path.decode('utf-8')
diff_list.append("{0} {1}".format(
self.__getDiffSummaryKind(
diff_sum['summarize_kind']),
@@ -237,8 +234,6 @@
url1, revision1=rev1,
url_or_path2=url2, revision2=rev2,
recurse=recurse)
- if sys.version_info[0] == 2:
- diffText = diffText.decode('utf-8')
else:
if pegRev is not None:
diffText = self.client.diff_peg(
@@ -250,8 +245,6 @@
diffText = self.client.diff(
tmpdir, name,
revision1=rev1, revision2=rev2, recurse=recurse)
- if sys.version_info[0] == 2:
- diffText = diffText.decode('utf-8')
counter = 0
for line in diffText.splitlines():
if line.startswith("--- ") or \
