chore: fix

libs/pyTermTk/TermTk/TTkCore/ttk.py

@@ -23,7 +23,6 @@
 __all__ = ['TTk']
 
 import os
-import sys
 import signal
 import time
 import threading

tests/pytest/mock_term.py

@@ -23,6 +23,7 @@
 # Thanks to: https://stackoverflow.com/questions/43162722/mocking-a-module-import-in-pytest
 
 import sys
+from enum import Flag
 
 class Mock_TTkTerm():
     CLEAR         = None
@@ -63,11 +64,13 @@ class Mock_TTkTerm():
         @staticmethod
         def hide(): pass
 
-    class Sigmask():
+    class Sigmask(Flag):
+        NONE   = 0x0000
         CTRL_C = 0x0001
         CTRL_S = 0x0002
         CTRL_Z = 0x0004
         CTRL_Q = 0x0008
+        CTRL_Y = 0x0010
 
     @staticmethod
     def push(*args):
@@ -83,3 +86,9 @@ class Mock_TTkTerm():
     @staticmethod
     def getTerminalSize():
         return 250,70
+    @staticmethod
+    def getStdErr():
+        return sys.stderr
+    @staticmethod
+    def setStdErr(err):
+        sys.stderr = err

tests/pytest/test_005_stderr.py

@@ -21,51 +21,36 @@
 # SOFTWARE.
 
 import sys, os, io
-import logging
 import pytest
-from typing import Union, Optional
 
 sys.path.append(os.path.join(sys.path[0],'../../libs/pyTermTk'))
 
 import TermTk as ttk
 
 
-class FakeStderr():
+@pytest.fixture(autouse=True)
+def reset_fake_stderr():
+    """Reset FakeStderr before each test"""
+    FakeStderr.value = []
+    yield
+    FakeStderr.value = []
+
+
+class FakeStderr:
     value = []
 
+
 def message_handler(mode, context, message):
     FakeStderr.value.append(message)
     msgType = "NONE"
-    if   mode == ttk.TTkLog.InfoMsg:     msgType = "[INFO]"
-    elif mode == ttk.TTkLog.WarningMsg:  msgType = "[WARNING]"
-    elif mode == ttk.TTkLog.CriticalMsg: msgType = "[CRITICAL]"
-    elif mode == ttk.TTkLog.FatalMsg:    msgType = "[FATAL]"
-    elif mode == ttk.TTkLog.ErrorMsg:    msgType = "[ERROR]"
+    if mode == ttk.TTkLog.InfoMsg:
+        msgType = "[INFO]"
+    elif mode == ttk.TTkLog.WarningMsg:
+        msgType = "[WARNING]"
+    elif mode == ttk.TTkLog.CriticalMsg:
+        msgType = "[CRITICAL]"
+    elif mode == ttk.TTkLog.FatalMsg:
+        msgType = "[FATAL]"
+    elif mode == ttk.TTkLog.ErrorMsg:
+        msgType = "[ERROR]"
     print(f"{msgType} {context.file} {message}")
-
-def test_stderr_01():
-    ttk.TTkLog.installMessageHandler(message_handler)
-
-    print('Test',file=sys.stderr)
-    with ttk.ttk_capture_stderr():
-        print('XXXXX Test',file=sys.stderr)
-        with open('pippo','r') as f:
-            f.read()
-        raise ValueError('YYYYY Test')
-    print('After Test')
-
-def test_ttk_capture_stderr():
-    ttk.TTkLog.installMessageHandler(message_handler)
-    with ttk.ttk_capture_stderr() as fake_stderr:
-        print("This is an error message", file=sys.stderr)
-    output = FakeStderr.value
-    assert "This is an error message" in output
-
-def test_ttk_capture_stderr_exception_handling():
-    ttk.TTkLog.installMessageHandler(message_handler)
-    with ttk.ttk_capture_stderr() as fake_stderr:
-        raise ValueError("Test exception")
-    # After the exception, sys.stderr should be restored
-    output = FakeStderr.value
-    assert any("Test exception" in _o for _o in output)
-    assert isinstance(sys.stderr, io.TextIOWrapper) or sys.stderr is sys.__stderr__

tools/check.import.sh

@@ -31,6 +31,7 @@ __check(){
             -e "ttk.py:import queue" \
             -e "ttk.py:import threading" \
             -e "ttk.py:import platform" \
+            -e "ttk.py:import contextlib" \
             -e "clipboard.py:import importlib.util" \
             -e "filebuffer.py:import threading" \
             -e "texedit.py:from math import log10, floor" \
@@ -47,6 +48,7 @@ __check(){
             -e "savetools.py:import json" \
             -e "TTkCore/constant.py:from enum import IntEnum" |
         grep -v \
+            -e "TTkTerm/term_base.py:from enum import Flag" \
             -e "TTkTerm/input_mono.py:from time import time" \
             -e "TTkTerm/input_mono.py:import platform" \
             -e "TTkTerm/input_mono.py:from ..drivers import TTkInputDriver" \
@@ -61,10 +63,10 @@ __check(){
             -e "TTkGui/textdocument_highlight_pygments.py:from pygments" |
         grep -v \
             -e "TTkTerm/term.py:from ..drivers import *" \
-            -e "drivers/unix_thread.py:import sys, os" \
-            -e "drivers/unix_thread.py:from select import select" \
-            -e "drivers/unix_thread.py:import threading" \
-            -e "drivers/unix_thread.py:import queue" \
+            -e "drivers/_unused_.unix_thread.py:import sys, os" \
+            -e "drivers/_unused_.unix_thread.py:from select import select" \
+            -e "drivers/_unused_.unix_thread.py:import threading" \
+            -e "drivers/_unused_.unix_thread.py:import queue" \
             -e "drivers/unix.py:import sys, os, re" \
             -e "drivers/unix.py:import signal" \
             -e "drivers/unix.py:from select import select" \