Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py

changeset 945
8cd4d08fa9f6
parent 882
34b86be88bf0
child 1034
8a7fa049e9d3
--- a/Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py	Fri Mar 11 08:55:14 2011 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py	Fri Mar 11 16:51:57 2011 +0100
@@ -20,11 +20,12 @@
 import Utilities
 import Preferences
 
+
 class HgDiffDialog(QWidget, Ui_HgDiffDialog):
     """
     Class implementing a dialog to show the output of the hg diff command process.
     """
-    def __init__(self, vcs, parent = None):
+    def __init__(self, vcs, parent=None):
         """
         Constructor
         
@@ -83,7 +84,7 @@
         else:
             return str(version)
     
-    def start(self, fn, versions = None, bundle = None):
+    def start(self, fn, versions=None, bundle=None):
         """
         Public slot to start the hg diff command.
         
@@ -197,7 +198,7 @@
     
     def __readStdout(self):
         """
-        Private slot to handle the readyReadStandardOutput signal. 
+        Private slot to handle the readyReadStandardOutput signal.
         
         It reads the output of the process, formats it and inserts it into
         the contents pane.
@@ -205,8 +206,8 @@
         self.process.setReadChannel(QProcess.StandardOutput)
         
         while self.process.canReadLine():
-            line = str(self.process.readLine(), 
-                        Preferences.getSystem("IOEncoding"), 
+            line = str(self.process.readLine(),
+                        Preferences.getSystem("IOEncoding"),
                         'replace')
             if line.startswith('+'):
                 format = self.cAddedFormat
@@ -228,8 +229,8 @@
         """
         if self.process is not None:
             self.errorGroup.show()
-            s = str(self.process.readAllStandardError(), 
-                    Preferences.getSystem("IOEncoding"), 
+            s = str(self.process.readAllStandardError(),
+                    Preferences.getSystem("IOEncoding"),
                     'replace')
             self.errors.insertPlainText(s)
             self.errors.ensureCursorVisible()
@@ -284,13 +285,13 @@
                 self.trUtf8("Save Diff"),
                 self.trUtf8("<p>The patch file <b>{0}</b> already exists."
                             " Overwrite it?</p>").format(fname),
-                icon = E5MessageBox.Warning)
+                icon=E5MessageBox.Warning)
             if not res:
                 return
         fname = Utilities.toNativeSeparators(fname)
         
         try:
-            f = open(fname, "w", encoding = "utf-8")
+            f = open(fname, "w", encoding="utf-8")
             f.write(self.contents.toPlainText())
             f.close()
         except IOError as why:

eric ide

mercurial