Mercurial Repositories > eric / file diff

--- a/Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py	Wed Dec 04 22:08:03 2013 +0100
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py	Fri Dec 13 22:45:47 2013 +0100
@@ -11,6 +11,7 @@
 from __future__ import unicode_literals    # __IGNORE_WARNING__
 
 import os
+import sys
 
 import pysvn
 
@@ -215,10 +216,13 @@
                             recurse=recurse)
                         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']),
-                                diff_sum['path']))
+                                path))
                         diffText = os.linesep.join(diff_list)
                     else:
                         diffText = self.client.diff(
@@ -226,6 +230,8 @@
                             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(
@@ -237,6 +243,8 @@
                         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 \