Mercurial Repositories > eric / file diff

--- a/eric6/UI/CompareDialog.py	Fri Apr 02 11:59:41 2021 +0200
+++ b/eric6/UI/CompareDialog.py	Sat May 01 14:27:20 2021 +0200
@@ -95,7 +95,7 @@
             (list of two tuples of two strings)
         @param parent parent widget (QWidget)
         """
-        super(CompareDialog, self).__init__(parent)
+        super().__init__(parent)
         self.setupUi(self)
         
         if files is None:
@@ -186,7 +186,7 @@
         """
         if filename:
             self.file1Picker.setText(filename)
-        super(CompareDialog, self).show()
+        super().show()
         
     def __appendText(self, pane, linenumber, line, charFormat,
                      interLine=False):
@@ -307,11 +307,12 @@
         deleted = 0
         changed = 0
         
-        paras = 1
         self.diffParas = []
         self.currentDiffPos = -1
         oldOpcode = ''
-        for opcode, ln1, l1, ln2, l2 in sbsdiff(lines1, lines2):
+        for paras, (opcode, ln1, l1, ln2, l2) in enumerate(
+            sbsdiff(lines1, lines2), start=1
+        ):
             if opcode in 'idr':
                 if oldOpcode != opcode:
                     oldOpcode = opcode
@@ -344,7 +345,6 @@
                 format2 = self.cNormalFormat
             self.__appendText(self.contents_1, ln1, l1, format1, opcode == 'r')
             self.__appendText(self.contents_2, ln2, l2, format2, opcode == 'r')
-            paras += 1
             if not (paras % self.updateInterval):
                 QApplication.processEvents()
         
@@ -470,7 +470,7 @@
             (list of two tuples of two strings)
         @param parent reference to the parent widget (QWidget)
         """
-        super(CompareWindow, self).__init__(parent)
+        super().__init__(parent)
         
         self.setStyle(Preferences.getUI("Style"),
                       Preferences.getUI("StyleSheet"))