--- a/eric6/UI/UserInterface.py Thu Apr 15 16:52:05 2021 +0200 +++ b/eric6/UI/UserInterface.py Thu Apr 15 18:11:24 2021 +0200 @@ -1477,7 +1477,7 @@ "eric6installpip.json") if os.path.exists(filename): # eric was installed via pip (i.e. eric-ide) - try: + with contextlib.suppress(OSError): installDateTime = datetime.datetime.now(tz=None) with open(filename, "r") as infoFile: installInfo = json.load(infoFile) @@ -1497,9 +1497,6 @@ installInfo["eric"], os.W_OK) with open(installInfoFile, "w") as infoFile: json.dump(installInfo, infoFile, indent=2) - except OSError: - # ignore this - pass else: changed = False with open(installInfoFile, "r") as infoFile: @@ -3758,34 +3755,28 @@ versionText += ( """<tr><td><b>PyQt</b></td><td>{0}</td></tr>""" ).format(PYQT_VERSION_STR) - try: + with contextlib.suppress(ImportError, AttributeError): from PyQt5 import QtChart versionText += ( """<tr><td><b>PyQtChart</b></td><td>{0}</td></tr>""" ).format(QtChart.PYQT_CHART_VERSION_STR) - except (ImportError, AttributeError): - pass - try: + with contextlib.suppress(ImportError, AttributeError): from PyQt5 import QtWebEngine versionText += ( """<tr><td><b>PyQtWebEngine</b></td><td>{0}</td></tr>""" ).format(QtWebEngine.PYQT_WEBENGINE_VERSION_STR) - except (ImportError, AttributeError): - pass versionText += ( """<tr><td><b>QScintilla</b></td><td>{0}</td></tr>""" ).format(QSCINTILLA_VERSION_STR) versionText += ( """<tr><td><b>sip</b></td><td>{0}</td></tr>""" ).format(sip_version_str) - try: + with contextlib.suppress(ImportError): from WebBrowser.Tools import WebBrowserTools chromeVersion = WebBrowserTools.getWebEngineVersions()[0] versionText += ( """<tr><td><b>WebEngine</b></td><td>{0}</td></tr>""" ).format(chromeVersion) - except ImportError: - pass versionText += ("""<tr><td><b>{0}</b></td><td>{1}</td></tr>""" ).format(Program, Version) versionText += self.tr("""</table>""") @@ -4101,12 +4092,9 @@ """ toolbars = [] for tbName in self.__toolbars: - try: + with contextlib.suppress(IndexError): if self.__toolbars[tbName][2] == category: toolbars.append(self.__toolbars[tbName][1]) - except IndexError: - # backward compatibility; category is not yet supported - pass return toolbars