--- a/UI/DiffDialog.py Fri Oct 18 23:00:41 2013 +0200
+++ b/UI/DiffDialog.py Fri Nov 01 15:48:48 2013 +0100
@@ -302,7 +302,8 @@
if ex:
fname += ex
if QFileInfo(fname).exists():
- res = E5MessageBox.yesNo(self,
+ res = E5MessageBox.yesNo(
+ self,
self.trUtf8("Save Diff"),
self.trUtf8("<p>The patch file <b>{0}</b> already exists."
" Overwrite it?</p>").format(fname),
@@ -341,7 +342,8 @@
lines1 = f1.readlines()
f1.close()
except IOError:
- E5MessageBox.critical(self,
+ E5MessageBox.critical(
+ self,
self.trUtf8("Compare Files"),
self.trUtf8(
"""<p>The file <b>{0}</b> could not be read.</p>""")
@@ -358,7 +360,8 @@
lines2 = f2.readlines()
f2.close()
except IOError:
- E5MessageBox.critical(self,
+ E5MessageBox.critical(
+ self,
self.trUtf8("Compare Files"),
self.trUtf8(
"""<p>The file <b>{0}</b> could not be read.</p>""")
@@ -398,7 +401,7 @@
self.contents.insertPlainText(txt)
def __generateUnifiedDiff(self, a, b, fromfile, tofile,
- fromfiledate, tofiledate):
+ fromfiledate, tofiledate):
"""
Private slot to generate a unified diff output.
@@ -411,7 +414,7 @@
"""
paras = 0
for line in unified_diff(a, b, fromfile, tofile,
- fromfiledate, tofiledate):
+ fromfiledate, tofiledate):
if line.startswith('+') or line.startswith('>'):
format = self.cAddedFormat
elif line.startswith('-') or line.startswith('<'):
@@ -430,7 +433,7 @@
self.trUtf8('There is no difference.'), self.cNormalFormat)
def __generateContextDiff(self, a, b, fromfile, tofile,
- fromfiledate, tofiledate):
+ fromfiledate, tofiledate):
"""
Private slot to generate a context diff output.
@@ -443,7 +446,7 @@
"""
paras = 0
for line in context_diff(a, b, fromfile, tofile,
- fromfiledate, tofiledate):
+ fromfiledate, tofiledate):
if line.startswith('+ '):
format = self.cAddedFormat
elif line.startswith('- '):
