Mercurial Repositories > eric / file diff

diff -r b0996e4a289e -r 1d8dd9706f46 Plugins/VcsPlugins/vcsSubversion/SvnDialog.py
--- a/Plugins/VcsPlugins/vcsSubversion/SvnDialog.py	Fri Jan 01 16:11:36 2010 +0000
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnDialog.py	Sat Jan 02 15:11:35 2010 +0000
@@ -12,7 +12,7 @@
 from PyQt4.QtCore import *
 from PyQt4.QtGui import *
 
-from Ui_SvnDialog import Ui_SvnDialog
+from .Ui_SvnDialog import Ui_SvnDialog
 
 import Preferences
 
@@ -156,7 +156,9 @@
         the contents pane.
         """
         if self.proc is not None:
-            s = unicode(self.proc.readAllStandardOutput())
+            s = str(self.proc.readAllStandardOutput(), 
+                    Preferences.getSystem("IOEncoding"), 
+                    'replace')
             self.resultbox.insertPlainText(s)
             self.resultbox.ensureCursorVisible()
             if not self.__hasAddOrDelete and len(s) > 0:
@@ -175,7 +177,9 @@
         """
         if self.proc is not None:
             self.errorGroup.show()
-            s = unicode(self.proc.readAllStandardError())
+            s = str(self.proc.readAllStandardError(), 
+                    Preferences.getSystem("IOEncoding"), 
+                    'replace')
             self.errors.insertPlainText(s)
             self.errors.ensureCursorVisible()