From 210c2d623171a5c38fee735a37119d7c3cd7f52c Mon Sep 17 00:00:00 2001 From: francois Date: Thu, 12 Feb 2026 22:21:56 +0100 Subject: [PATCH] moved code for coherence --- src/{testium => }/lua_func/handle.lua | 0 src/{testium => }/lua_func/json-rpc.lua | 0 src/{testium => }/lua_func/main.lua | 0 src/{testium => }/lua_func/tm.lua | 0 src/{testium => }/lua_func/utils.lua | 0 src/{testium => }/py_func/__init__.py | 2 +- src/{testium => }/py_func/__main__.py | 0 src/{testium => }/py_func/func_call.py | 2 +- src/{testium => }/py_func/handle.py | 4 ++-- src/{testium => }/py_func/tm.py | 4 ++-- src/testium/interpreter/test_items/test_item_lua_func.py | 2 +- src/testium/interpreter/utils/py_process.py | 5 +---- 12 files changed, 8 insertions(+), 11 deletions(-) rename src/{testium => }/lua_func/handle.lua (100%) rename src/{testium => }/lua_func/json-rpc.lua (100%) rename src/{testium => }/lua_func/main.lua (100%) rename src/{testium => }/lua_func/tm.lua (100%) rename src/{testium => }/lua_func/utils.lua (100%) rename src/{testium => }/py_func/__init__.py (95%) rename src/{testium => }/py_func/__main__.py (100%) rename src/{testium => }/py_func/func_call.py (95%) rename src/{testium => }/py_func/handle.py (95%) rename src/{testium => }/py_func/tm.py (96%) diff --git a/src/testium/lua_func/handle.lua b/src/lua_func/handle.lua similarity index 100% rename from src/testium/lua_func/handle.lua rename to src/lua_func/handle.lua diff --git a/src/testium/lua_func/json-rpc.lua b/src/lua_func/json-rpc.lua similarity index 100% rename from src/testium/lua_func/json-rpc.lua rename to src/lua_func/json-rpc.lua diff --git a/src/testium/lua_func/main.lua b/src/lua_func/main.lua similarity index 100% rename from src/testium/lua_func/main.lua rename to src/lua_func/main.lua diff --git a/src/testium/lua_func/tm.lua b/src/lua_func/tm.lua similarity index 100% rename from src/testium/lua_func/tm.lua rename to src/lua_func/tm.lua diff --git a/src/testium/lua_func/utils.lua b/src/lua_func/utils.lua similarity index 100% rename from src/testium/lua_func/utils.lua rename to src/lua_func/utils.lua diff --git a/src/testium/py_func/__init__.py b/src/py_func/__init__.py similarity index 95% rename from src/testium/py_func/__init__.py rename to src/py_func/__init__.py index d6c4513..8ca8430 100755 --- a/src/testium/py_func/__init__.py +++ b/src/py_func/__init__.py @@ -1,7 +1,7 @@ #!/usr/bin/env python import multiprocessing from py_func.tm import _init_api, _remote_print -from interpreter.utils.stdout_redirect import stdio_redir +from testium.interpreter.utils.stdout_redirect import stdio_redir class TcpStdOut: diff --git a/src/testium/py_func/__main__.py b/src/py_func/__main__.py similarity index 100% rename from src/testium/py_func/__main__.py rename to src/py_func/__main__.py diff --git a/src/testium/py_func/func_call.py b/src/py_func/func_call.py similarity index 95% rename from src/testium/py_func/func_call.py rename to src/py_func/func_call.py index e2c1f7c..799300d 100644 --- a/src/testium/py_func/func_call.py +++ b/src/py_func/func_call.py @@ -5,7 +5,7 @@ from pathlib import Path import importlib import traceback -from interpreter.utils.tum_except import ETUMRuntimeError, ETUMSyntaxError +from testium.interpreter.utils.tum_except import ETUMRuntimeError, ETUMSyntaxError from py_func import tm diff --git a/src/testium/py_func/handle.py b/src/py_func/handle.py similarity index 95% rename from src/testium/py_func/handle.py rename to src/py_func/handle.py index 12184da..e27b13f 100644 --- a/src/testium/py_func/handle.py +++ b/src/py_func/handle.py @@ -6,8 +6,8 @@ import platform import math import json import traceback -from interpreter.utils.jrpc import JsonRpcSrv -from interpreter.utils.tum_except import ETUMRuntimeError, print_exception +from testium.interpreter.utils.jrpc import JsonRpcSrv +from testium.interpreter.utils.tum_except import ETUMRuntimeError, print_exception from py_func.func_call import func_exec diff --git a/src/testium/py_func/tm.py b/src/py_func/tm.py similarity index 96% rename from src/testium/py_func/tm.py rename to src/py_func/tm.py index 2d0ebf9..12ad388 100644 --- a/src/testium/py_func/tm.py +++ b/src/py_func/tm.py @@ -17,8 +17,8 @@ is raised. import sys from py_func.handle import FuncHandler -from interpreter.utils.tum_except import ETUMRuntimeError -from interpreter.utils.api import SUPPORTED_API +from testium.interpreter.utils.tum_except import ETUMRuntimeError +from testium.interpreter.utils.api import SUPPORTED_API thismodule = sys.modules[__name__] # Shared FuncHandler instance used to forward API calls. Remains None diff --git a/src/testium/interpreter/test_items/test_item_lua_func.py b/src/testium/interpreter/test_items/test_item_lua_func.py index e62a980..ef3cf6d 100644 --- a/src/testium/interpreter/test_items/test_item_lua_func.py +++ b/src/testium/interpreter/test_items/test_item_lua_func.py @@ -14,7 +14,7 @@ from interpreter.utils.constants import TestItemType as cst class TestItemLuaFunc(TestItem): - """py_func item usage. + """lua_func item usage. func file: func_file.py, func_name: func, param: [$(variable1), [1, 2, 3], true] """ diff --git a/src/testium/interpreter/utils/py_process.py b/src/testium/interpreter/utils/py_process.py index 991d9a4..44a65d0 100644 --- a/src/testium/interpreter/utils/py_process.py +++ b/src/testium/interpreter/utils/py_process.py @@ -54,9 +54,7 @@ def _is_python_interpreter(path: str, timeout=2) -> bool: def _sys_python_bin(): - sys_python_bin = tm.gd("_sys_python_bin", "") - if sys_python_bin != "": - return sys_python_bin + sys_python_bin = "" cur_os = tm.OS() if cur_os == "Windows": @@ -73,7 +71,6 @@ def _sys_python_bin(): sys_python_bin = "" continue - tm.setgd("_sys_python_bin", sys_python_bin) return sys_python_bin