Plugins/VcsPlugins/vcsSubversion/SvnTagBranchListDialog.py

changeset 12
1d8dd9706f46
parent 0
de9c2efb9d02
child 13
1af94a91f439
--- a/Plugins/VcsPlugins/vcsSubversion/SvnTagBranchListDialog.py	Fri Jan 01 16:11:36 2010 +0000
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnTagBranchListDialog.py	Sat Jan 02 15:11:35 2010 +0000
@@ -10,7 +10,9 @@
 from PyQt4.QtCore import *
 from PyQt4.QtGui import *
 
-from Ui_SvnTagBranchListDialog import Ui_SvnTagBranchListDialog
+from .Ui_SvnTagBranchListDialog import Ui_SvnTagBranchListDialog
+
+import Preferences
 
 class SvnTagBranchListDialog(QDialog, Ui_SvnTagBranchListDialog):
     """
@@ -229,7 +231,9 @@
         self.process.setReadChannel(QProcess.StandardOutput)
         
         while self.process.canReadLine():
-            s = unicode(self.process.readLine())
+            s = str(self.process.readLine(), 
+                    Preferences.getSystem("IOEncoding"), 
+                    'replace')
             if self.rx_list.exactMatch(s):
                 rev = "%6s" % self.rx_list.cap(1)
                 author = self.rx_list.cap(2)
@@ -252,7 +256,9 @@
         """
         if self.process is not None:
             self.errorGroup.show()
-            s = unicode(self.process.readAllStandardError())
+            s = str(self.process.readAllStandardError(), 
+                    Preferences.getSystem("IOEncoding"), 
+                    'replace')
             self.errors.insertPlainText(s)
             self.errors.ensureCursorVisible()
         

eric ide

mercurial