Plugins/VcsPlugins/vcsPySvn/SvnBlameDialog.py

branch
Py2 comp.
changeset 3141
72f3bde98c58
parent 3058
0a02c433f52d
child 3145
a9de05d4a22f
diff -r e47a9d5954e8 -r 72f3bde98c58 Plugins/VcsPlugins/vcsPySvn/SvnBlameDialog.py
--- a/Plugins/VcsPlugins/vcsPySvn/SvnBlameDialog.py	Wed Dec 04 22:08:03 2013 +0100
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnBlameDialog.py	Fri Dec 13 22:45:47 2013 +0100
@@ -10,6 +10,7 @@
 from __future__ import unicode_literals    # __IGNORE_WARNING__
 
 import os
+import sys
 
 import pysvn
 
@@ -77,9 +78,14 @@
             annotations = self.client.annotate(fname)
             locker.unlock()
             for annotation in annotations:
+                author = annotation["author"]
+                line = annotation["line"]
+                if sys.version_info[0] == 2:
+                    author = author.decode('utf-8')
+                    line = line.decode('utf-8')
                 self.__generateItem(
-                    annotation["revision"].number, annotation["author"],
-                    annotation["number"] + 1, annotation["line"])
+                    annotation["revision"].number, author,
+                    annotation["number"] + 1, line)
         except pysvn.ClientError as e:
             locker.unlock()
             self.__showError(e.args[0] + '\n')

eric ide

mercurial