From 96d70c0f6bb5fa742231da5b448ced03aa067b2e Mon Sep 17 00:00:00 2001 From: Eugenio Parodi Date: Tue, 25 Jul 2023 13:50:55 +0100 Subject: [PATCH] updated import in the readinput --- TermTk/TTkCore/TTkTerm/readinputlinux.py | 5 +++-- TermTk/TTkCore/TTkTerm/readinputlinux_thread.py | 5 +++-- tools/check.import.sh | 6 ++++-- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/TermTk/TTkCore/TTkTerm/readinputlinux.py b/TermTk/TTkCore/TTkTerm/readinputlinux.py index a5852ac9..1295ada5 100644 --- a/TermTk/TTkCore/TTkTerm/readinputlinux.py +++ b/TermTk/TTkCore/TTkTerm/readinputlinux.py @@ -22,7 +22,8 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. -import sys, os, select, re +import sys, os, re +from select import select try: import fcntl, termios, tty except Exception as e: @@ -47,7 +48,7 @@ class ReadInput(): def read(self): rm = re.compile('(\033?[^\033]+)') - while self._readPipe[0] not in (list := select.select( [sys.stdin, self._readPipe[0]], [], [] )[0]): + while self._readPipe[0] not in (list := select( [sys.stdin, self._readPipe[0]], [], [] )[0]): # Read all the full input _fl = fcntl.fcntl(sys.stdin, fcntl.F_GETFL) fcntl.fcntl(sys.stdin, fcntl.F_SETFL, _fl | os.O_NONBLOCK) # Set the input as NONBLOCK to read the full sequence diff --git a/TermTk/TTkCore/TTkTerm/readinputlinux_thread.py b/TermTk/TTkCore/TTkTerm/readinputlinux_thread.py index c89252a5..d2b12e49 100644 --- a/TermTk/TTkCore/TTkTerm/readinputlinux_thread.py +++ b/TermTk/TTkCore/TTkTerm/readinputlinux_thread.py @@ -22,7 +22,8 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. -import sys, os, select +import sys, os +from select import select import threading import queue @@ -49,7 +50,7 @@ class ReadInput(): tty.setcbreak(_fn) while True: - rlist, _, _ = select.select( [sys.stdin, self._readPipe[0]], [], [] ) + rlist, _, _ = select( [sys.stdin, self._readPipe[0]], [], [] ) if self._readPipe[0] in rlist: break diff --git a/tools/check.import.sh b/tools/check.import.sh index 8f54910f..61d994e4 100755 --- a/tools/check.import.sh +++ b/tools/check.import.sh @@ -14,8 +14,10 @@ __check(){ -e "log.py:import logging" \ -e "log.py:from collections.abc import Callable, Set" \ -e "from time" -e "input.py:import platform" \ - -e "readinputlinux.py:import sys, os, select" \ - -e "readinputlinux_thread.py:import sys, os, select" \ + -e "readinputlinux.py:import sys, os" \ + -e "readinputlinux.py:from select import select" \ + -e "readinputlinux_thread.py:import sys, os" \ + -e "readinputlinux_thread.py:from select import select" \ -e "readinputlinux_thread.py:import threading" \ -e "readinputlinux_thread.py:import queue" \ -e "term.py:import importlib.util" \