Mercurial Repositories > eric / file diff

--- a/eric6/Plugins/VcsPlugins/vcsGit/GitDiffDialog.py	Fri Apr 02 11:59:41 2021 +0200
+++ b/eric6/Plugins/VcsPlugins/vcsGit/GitDiffDialog.py	Sat May 01 14:27:20 2021 +0200
@@ -8,6 +8,8 @@
 process.
 """
 
+import contextlib
+
 from PyQt5.QtCore import pyqtSlot, QFileInfo, Qt
 from PyQt5.QtGui import QTextCursor
 from PyQt5.QtWidgets import QWidget, QDialogButtonBox
@@ -36,7 +38,7 @@
         @param vcs reference to the vcs object
         @param parent parent widget (QWidget)
         """
-        super(GitDiffDialog, self).__init__(parent)
+        super().__init__(parent)
         self.setupUi(self)
         
         self.refreshButton = self.buttonBox.addButton(
@@ -144,12 +146,9 @@
         
         self.filesCombo.clear()
         
-        try:
+        with contextlib.suppress(AttributeError):
             self.highlighter.regenerateRules()
             self.highlighter2.regenerateRules()
-        except AttributeError:
-            # backward compatibility
-            pass
         
         if diffMode in ["work2repo", "work2stage", "stage2repo",
                         "work2stage2repo"]: