From 4e52550f67701095ba1c08b84b7edaf21f42e5ee Mon Sep 17 00:00:00 2001 From: wyzula-jan Date: Wed, 12 Jun 2024 12:35:03 +0200 Subject: [PATCH] fix: import pyqtRemoveInputHook only for pyqt distributions --- bec_widgets/widgets/console/console.py | 9 +++++++-- pyproject.toml | 2 ++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/bec_widgets/widgets/console/console.py b/bec_widgets/widgets/console/console.py index 4c64a06e..465afb33 100644 --- a/bec_widgets/widgets/console/console.py +++ b/bec_widgets/widgets/console/console.py @@ -4,12 +4,17 @@ import platform import sys import termqt -from qtpy.QtCore import QSocketNotifier, Qt, pyqtRemoveInputHook +from qtpy.QtCore import QSocketNotifier, Qt from qtpy.QtGui import QFont from qtpy.QtWidgets import QApplication, QHBoxLayout, QScrollBar, QWidget from termqt import Terminal -pyqtRemoveInputHook() +try: + from qtpy.QtCore import pyqtRemoveInputHook + + pyqtRemoveInputHook() +except ImportError: + pass if platform.system() in ["Linux", "Darwin"]: terminal_cmd = os.environ["SHELL"] diff --git a/pyproject.toml b/pyproject.toml index 538de686..95c4c3d7 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -25,6 +25,7 @@ dependencies = [ "pyqtdarktheme", "black", # needed for bw-generate-cli "isort", # needed for bw-generate-cli + "termqt @ git+ssh://git@github.com:TerryGeng/termqt.git" ] @@ -36,6 +37,7 @@ dev = [ "pytest-xvfb", "coverage", "pytest-qt", + "isort", "fakeredis", ] pyqt5 = ["PyQt5>=5.9", "PyQtWebEngine>=5.9"]