Mercurial Repositories > eric / file diff

--- a/eric6/Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py	Fri Apr 02 11:59:41 2021 +0200
+++ b/eric6/Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py	Sat May 01 14:27:20 2021 +0200
@@ -10,6 +10,7 @@
 import os
 import collections
 import re
+import contextlib
 
 from PyQt5.QtCore import (
     pyqtSlot, Qt, QDate, QProcess, QTimer, QSize, QPoint, QFileInfo
@@ -69,7 +70,7 @@
         @param vcs reference to the vcs object
         @param parent parent widget (QWidget)
         """
-        super(GitLogBrowserDialog, self).__init__(parent)
+        super().__init__(parent)
         self.setupUi(self)
         
         windowFlags = self.windowFlags()
@@ -413,7 +414,7 @@
         self.__restoreSplitterStates()
         self.__resetUI()
         
-        super(GitLogBrowserDialog, self).show()
+        super().show()
     
     def __reloadGeometry(self):
         """
@@ -727,14 +728,13 @@
             for parent in parents:
                 self.__childrenInfo[parent].append(commitId)
         
-        if self.logTree.topLevelItemCount() > 1:
-            topedges = (
-                self.logTree.topLevelItem(
-                    self.logTree.indexOfTopLevelItem(itm) - 1)
-                .data(0, self.__edgesRole)
-            )
-        else:
-            topedges = None
+        topedges = (
+            self.logTree.topLevelItem(
+                self.logTree.indexOfTopLevelItem(itm) - 1
+            ).data(0, self.__edgesRole)
+            if self.logTree.topLevelItemCount() > 1 else
+            None
+        )
         
         icon = self.__generateIcon(column, color, edges, topedges,
                                    QColor("blue"),
@@ -1182,7 +1182,7 @@
             self.intercept = False
             evt.accept()
             return
-        super(GitLogBrowserDialog, self).keyPressEvent(evt)
+        super().keyPressEvent(evt)
     
     def __prepareFieldSearch(self):
         """
@@ -2113,11 +2113,8 @@
         self.diffEdit.clear()
         self.diffLabel.setText(self.tr("Differences"))
         self.diffSelectLabel.clear()
-        try:
+        with contextlib.suppress(AttributeError):
             self.diffHighlighter.regenerateRules()
-        except AttributeError:
-            # backward compatibility
-            pass
         
         selectedItems = self.logTree.selectedItems()
         if len(selectedItems) == 1:
@@ -2263,12 +2260,9 @@
         if ":" in link:
             scheme, parent = link.split(":", 1)
             if scheme == "diff":
-                try:
+                with contextlib.suppress(ValueError):
                     parent = int(parent)
                     self.__generateDiffs(parent)
-                except ValueError:
-                    # ignore silently
-                    pass
     
     @pyqtSlot(str)
     def on_saveLabel_linkActivated(self, link):