Mercurial Repositories > eric / file diff

--- a/src/eric7/Utilities/__init__.py	Tue Oct 31 09:23:05 2023 +0100
+++ b/src/eric7/Utilities/__init__.py	Wed Nov 29 14:23:36 2023 +0100
@@ -10,6 +10,7 @@
 import codecs
 import contextlib
 import glob
+import importlib
 import json
 import os
 import re
@@ -1055,13 +1056,13 @@
     info.append("  Qt {0}".format(qVersion()))
     info.append("  PyQt6 {0}".format(PYQT_VERSION_STR))
     try:
-        from PyQt6 import QtCharts  # __IGNORE_WARNING_I10__
+        from PyQt6 import QtCharts  # noqa: I101, I102
 
         info.append("  PyQt6-Charts {0}".format(QtCharts.PYQT_CHART_VERSION_STR))
     except (AttributeError, ImportError):
         info.append("  PyQt6-Charts not installed")
     try:
-        from PyQt6 import QtWebEngineCore  # __IGNORE_WARNING_I10__
+        from PyQt6 import QtWebEngineCore  # noqa: I101, I102
 
         info.append(
             "  PyQt6-WebEngine {0}".format(QtWebEngineCore.PYQT_WEBENGINE_VERSION_STR)
@@ -1070,10 +1071,8 @@
         info.append("  PyQt6-WebEngine not installed")
     info.append("  PyQt6-QScintilla {0}".format(QSCINTILLA_VERSION_STR))
     info.append("  sip {0}".format(sip_version_str))
-    with contextlib.suppress(ImportError):
-        from PyQt6 import QtWebEngineWidgets  # __IGNORE_WARNING__
-
-        from eric7.WebBrowser.Tools import WebBrowserTools  # __IGNORE_WARNING_I101__
+    if bool(importlib.util.find_spec("PyQt6.QtWebEngineWidgets")):
+        from eric7.WebBrowser.Tools import WebBrowserTools  # noqa: I101
 
         (
             chromiumVersion,
@@ -1137,7 +1136,7 @@
     @rtype str
     """
     info = []
-    if OSUtilities.isLinuxPlatform():
+    if OSUtilities.isLinuxPlatform() or OSUtilities.isFreeBsdPlatform():
         releaseList = glob.glob("/etc/*-release")
         if releaseList:
             info.append("Distribution Info:")