--- a/eric6/Plugins/VcsPlugins/vcsGit/GitDiffDialog.py Thu Apr 15 16:52:05 2021 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsGit/GitDiffDialog.py Thu Apr 15 18:11:24 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 @@ -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"]: