Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py

branch
Py2 comp.
changeset 3060
5883ce99ee12
parent 3058
0a02c433f52d
parent 3036
30c81c9e88b8
child 3145
a9de05d4a22f
diff -r 0a02c433f52d -r 5883ce99ee12 Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py
--- a/Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py	Sun Nov 03 15:58:22 2013 +0100
@@ -319,8 +319,8 @@
         
         while self.process.canReadLine():
             line = str(self.process.readLine(),
-                        Preferences.getSystem("IOEncoding"),
-                        'replace')
+                       Preferences.getSystem("IOEncoding"),
+                       'replace')
             self.__processOutputLine(line)
     
     def __readStderr(self):
@@ -447,7 +447,7 @@
                 self.trUtf8(
                     '<p>The patch file <b>{0}</b> could not be saved.'
                     '<br>Reason: {1}</p>')
-                    .format(fname, str(why)))
+                .format(fname, str(why)))
     
     def on_passwordCheckBox_toggled(self, isOn):
         """

eric ide

mercurial