diff --git a/package/pyinstaller/testium.spec b/package/pyinstaller/testium.spec index 5e8c5c8..dc8af2b 100644 --- a/package/pyinstaller/testium.spec +++ b/package/pyinstaller/testium.spec @@ -1,12 +1,14 @@ # -*- mode: python ; coding: utf-8 -*- - a = Analysis( ['../../src/testium/__main__.py'], pathex=['../../src/testium', '../../src/testium/main_win/resources'], binaries=[], - datas=[ ('../../src/VERSION', '.')], + datas=[ ('../../src/VERSION', '.'), + ('../../src/lua_func', 'lua_func'), + ('../../src/py_func', 'py_func'), + ('../../src/lib', 'lib')], hiddenimports=["git", "interpreter", "main_win", diff --git a/src/lib/__init__.py b/src/lib/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/src/testium/interpreter/utils/api.py b/src/lib/api.py similarity index 100% rename from src/testium/interpreter/utils/api.py rename to src/lib/api.py diff --git a/src/testium/interpreter/utils/jrpc.py b/src/lib/jrpc.py similarity index 99% rename from src/testium/interpreter/utils/jrpc.py rename to src/lib/jrpc.py index c5c913a..0b0cc9c 100644 --- a/src/testium/interpreter/utils/jrpc.py +++ b/src/lib/jrpc.py @@ -5,9 +5,12 @@ import threading import itertools from time import sleep from typing import Callable, Any -import libs.testium as tm +try: + import libs.testium as tm +except: + import py_func.tm as tm -from interpreter.utils.tum_except import ETUMRuntimeError +from lib.tum_except import ETUMRuntimeError """Lightweight JSON-RPC 2.0 helpers over TCP sockets. diff --git a/src/testium/interpreter/utils/stdout_redirect.py b/src/lib/stdout_redirect.py similarity index 97% rename from src/testium/interpreter/utils/stdout_redirect.py rename to src/lib/stdout_redirect.py index 25b66a7..1adc047 100644 --- a/src/testium/interpreter/utils/stdout_redirect.py +++ b/src/lib/stdout_redirect.py @@ -1,6 +1,6 @@ import sys from threading import (Thread, Event) -from interpreter.utils.string_queue import StringQueue +from lib.string_queue import StringQueue from time import (sleep) class StdioRedirect: diff --git a/src/testium/interpreter/utils/string_queue.py b/src/lib/string_queue.py similarity index 100% rename from src/testium/interpreter/utils/string_queue.py rename to src/lib/string_queue.py diff --git a/src/testium/interpreter/utils/tum_except.py b/src/lib/tum_except.py similarity index 100% rename from src/testium/interpreter/utils/tum_except.py rename to src/lib/tum_except.py diff --git a/src/py_func/__init__.py b/src/py_func/__init__.py index 8ca8430..dffa97e 100755 --- a/src/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 testium.interpreter.utils.stdout_redirect import stdio_redir +from lib.stdout_redirect import stdio_redir class TcpStdOut: diff --git a/src/py_func/func_call.py b/src/py_func/func_call.py index 799300d..4cb580d 100644 --- a/src/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 testium.interpreter.utils.tum_except import ETUMRuntimeError, ETUMSyntaxError +from lib.tum_except import ETUMRuntimeError, ETUMSyntaxError from py_func import tm diff --git a/src/py_func/handle.py b/src/py_func/handle.py index af4c7d5..758e19d 100644 --- a/src/py_func/handle.py +++ b/src/py_func/handle.py @@ -7,8 +7,8 @@ import math import json import traceback -from testium.interpreter.utils.jrpc import JsonRpcSrv -from testium.interpreter.utils.tum_except import ETUMRuntimeError, print_exception +from lib.jrpc import JsonRpcSrv +from lib.tum_except import ETUMRuntimeError, print_exception import py_func.tm as tm from py_func.func_call import func_exec diff --git a/src/py_func/tm.py b/src/py_func/tm.py index 12ad388..2a89096 100644 --- a/src/py_func/tm.py +++ b/src/py_func/tm.py @@ -1,24 +1,8 @@ -"""tm — proxy module exposing remote-callable API functions. - -This module dynamically exposes functions listed in -``interpreter.utils.api.SUPPORTED_API``. Each exposed function is a -thin wrapper that forwards the call to a running ``FuncHandler`` -instance (stored in ``_func_call_thread``). - -Typical usage: - >>> from testium.py_func import tm - >>> handler = tm._init_api(port) - >>> tm.some_api_function(args) - -Only after ``_init_api`` has been called will API functions be able to -send requests to the remote handler; otherwise an ``ETUMRuntimeError`` -is raised. -""" import sys from py_func.handle import FuncHandler -from testium.interpreter.utils.tum_except import ETUMRuntimeError -from testium.interpreter.utils.api import SUPPORTED_API +from lib.tum_except import ETUMRuntimeError +from lib.api import SUPPORTED_API thismodule = sys.modules[__name__] # Shared FuncHandler instance used to forward API calls. Remains None diff --git a/src/testium/interpreter/batch.py b/src/testium/interpreter/batch.py index 3deb722..5e2a8ab 100644 --- a/src/testium/interpreter/batch.py +++ b/src/testium/interpreter/batch.py @@ -8,8 +8,8 @@ from multiprocessing import Queue from interpreter.process import TestProcess from interpreter.utils.test_ctrl import TestSetController -from interpreter.utils.tum_except import ETUMFileError -from interpreter.utils.stdout_redirect import stdio_redir +from lib.tum_except import ETUMFileError +from lib.stdout_redirect import stdio_redir class Batch: diff --git a/src/testium/interpreter/process.py b/src/testium/interpreter/process.py index 9107a78..880050a 100644 --- a/src/testium/interpreter/process.py +++ b/src/testium/interpreter/process.py @@ -1,15 +1,14 @@ import os -import sys from multiprocessing import Process, Queue, Pipe from queue import Empty from threading import Thread from time import sleep import copy +from lib.string_queue import StringQueue +from lib.tum_except import print_exception, ETUMRuntimeError, ETUMSyntaxError import libs.testium as tm from interpreter.utils.params import expanse -from interpreter.utils.string_queue import StringQueue -from interpreter.utils.tum_except import ETUMRuntimeError, ETUMSyntaxError from interpreter.utils.test_ctrl import TestSetController from interpreter.utils.test_init import ( env_init, @@ -25,10 +24,9 @@ from interpreter.utils.test_init import ( from interpreter.utils.constants import TestItemType as cst_type from interpreter.test_set import TestSet from interpreter.utils.include import TUMLoader, TUMLoaderNoIncludes, TUMLoaderRawIncludes -from interpreter.utils.stdout_redirect import stdio_redir +from lib.stdout_redirect import stdio_redir from interpreter.utils.template import template_to_test from interpreter.utils.yaml_load import yaml_load -from interpreter.utils.tum_except import print_exception from interpreter.utils.py_eval import eval_process_init from interpreter.utils.api_srv import api_request diff --git a/src/testium/interpreter/terminal.py b/src/testium/interpreter/terminal.py index dbe8af0..aa6ca3d 100644 --- a/src/testium/interpreter/terminal.py +++ b/src/testium/interpreter/terminal.py @@ -90,7 +90,7 @@ class Terminal(Cmd): # redirect output if 'Linux' in platform.system() and not no_color: - from interpreter.utils.stdout_redirect import stdio_redir + from lib.stdout_redirect import stdio_redir try: from interpreter.utils.termlog import TermLog stdio_redir.redirect(TermLog(sys.stdout)) diff --git a/src/testium/interpreter/test_items/item_actions/__init__.py b/src/testium/interpreter/test_items/item_actions/__init__.py index 8171554..98c7080 100644 --- a/src/testium/interpreter/test_items/item_actions/__init__.py +++ b/src/testium/interpreter/test_items/item_actions/__init__.py @@ -1,4 +1,4 @@ -from interpreter.utils.tum_except import ETUMSyntaxError +from lib.tum_except import ETUMSyntaxError from interpreter.test_items.test_item import TestItem, test_run, test_data from interpreter.test_items.test_result import TestResult, TestValue from interpreter.test_items.item_actions.action import TestItemAction diff --git a/src/testium/interpreter/test_items/test_item.py b/src/testium/interpreter/test_items/test_item.py index d1953f6..201e7fc 100644 --- a/src/testium/interpreter/test_items/test_item.py +++ b/src/testium/interpreter/test_items/test_item.py @@ -7,7 +7,7 @@ import libs.testium as tm from interpreter.utils.params import TestItemParams from interpreter.utils.constants import TestItemType as cst_type from interpreter.utils.eval import eval_to_boolean, evaluate, post_evaluate -from interpreter.utils.tum_except import ETUMSyntaxError +from lib.tum_except import ETUMSyntaxError LOG_TEST_STOP = '<----- step "{}" finished' LOG_TEST_START = '-----> step "{}" started' diff --git a/src/testium/interpreter/test_items/test_item_check.py b/src/testium/interpreter/test_items/test_item_check.py index 200f1e3..c0c9597 100644 --- a/src/testium/interpreter/test_items/test_item_check.py +++ b/src/testium/interpreter/test_items/test_item_check.py @@ -1,7 +1,7 @@ from interpreter.test_items.test_item import (TestItem, test_run) from interpreter.test_items.test_result import TestValue -from interpreter.utils.tum_except import ETUMSyntaxError +from lib.tum_except import ETUMSyntaxError import libs.testium as tm from interpreter.utils.constants import TestItemType as cst from interpreter.utils.eval import evaluate diff --git a/src/testium/interpreter/test_items/test_item_choices_dialog.py b/src/testium/interpreter/test_items/test_item_choices_dialog.py index d5b4c41..77c9029 100644 --- a/src/testium/interpreter/test_items/test_item_choices_dialog.py +++ b/src/testium/interpreter/test_items/test_item_choices_dialog.py @@ -4,7 +4,7 @@ from interpreter.test_items.test_item import TestItem, test_run from interpreter.test_items.test_result import TestResult, TestValue from interpreter.test_items.dialog_choices_files import choices_dialog import libs.testium as tm -from interpreter.utils.tum_except import ETUMSyntaxError +from lib.tum_except import ETUMSyntaxError from interpreter.utils.constants import TestItemType as cst diff --git a/src/testium/interpreter/test_items/test_item_console.py b/src/testium/interpreter/test_items/test_item_console.py index 4de4cf4..0923d4f 100644 --- a/src/testium/interpreter/test_items/test_item_console.py +++ b/src/testium/interpreter/test_items/test_item_console.py @@ -4,8 +4,8 @@ import importlib import traceback import libs.testium as tm -from interpreter.utils.tum_except import ETUMSyntaxError -from interpreter.utils.stdout_redirect import stdio_redir +from lib.tum_except import ETUMSyntaxError +from lib.stdout_redirect import stdio_redir from interpreter.test_items.test_item import test_run from interpreter.test_items.item_actions import TestItemActions from interpreter.test_items.item_actions.action import TestItemAction diff --git a/src/testium/interpreter/test_items/test_item_cycle.py b/src/testium/interpreter/test_items/test_item_cycle.py index 316d166..2b439bc 100644 --- a/src/testium/interpreter/test_items/test_item_cycle.py +++ b/src/testium/interpreter/test_items/test_item_cycle.py @@ -1,6 +1,6 @@ import traceback -from interpreter.utils.tum_except import ETUMSyntaxError, ETUMRuntimeError +from lib.tum_except import ETUMSyntaxError, ETUMRuntimeError from interpreter.utils.py_func_exec import PyFuncExecEngine from interpreter.utils.api_srv import api_request from interpreter.test_items.test_item import TestItem, test_run diff --git a/src/testium/interpreter/test_items/test_item_git.py b/src/testium/interpreter/test_items/test_item_git.py index 9d986aa..b5b809a 100644 --- a/src/testium/interpreter/test_items/test_item_git.py +++ b/src/testium/interpreter/test_items/test_item_git.py @@ -1,7 +1,7 @@ from interpreter.test_items.test_item import (TestItem, test_run) from interpreter.test_items.test_result import (TestValue) from interpreter.utils.constants import TestItemType as cst -from interpreter.utils.tum_except import ETUMParamError, ETUMSyntaxError +from lib.tum_except import ETUMParamError, ETUMSyntaxError import interpreter.utils.version as git class TestItemGit(TestItem): diff --git a/src/testium/interpreter/test_items/test_item_group.py b/src/testium/interpreter/test_items/test_item_group.py index eb15022..81e89d5 100644 --- a/src/testium/interpreter/test_items/test_item_group.py +++ b/src/testium/interpreter/test_items/test_item_group.py @@ -1,7 +1,7 @@ from interpreter.test_items.test_item import (TestItem, test_run) from interpreter.test_items.test_result import (TestResult, TestValue) from interpreter.utils.constants import TestItemType as cst -from interpreter.utils.tum_except import ETUMSyntaxError +from lib.tum_except import ETUMSyntaxError import libs.testium as tm class TestItemGroup(TestItem): diff --git a/src/testium/interpreter/test_items/test_item_image_dialog.py b/src/testium/interpreter/test_items/test_item_image_dialog.py index c436108..9a3b96d 100644 --- a/src/testium/interpreter/test_items/test_item_image_dialog.py +++ b/src/testium/interpreter/test_items/test_item_image_dialog.py @@ -7,7 +7,7 @@ from interpreter.test_items.test_result import TestResult, TestValue from interpreter.test_items.dialog_image_files import dialog_image import libs.testium as tm from interpreter.utils.constants import TestItemType as cst -from interpreter.utils.tum_except import ETUMSyntaxError +from lib.tum_except import ETUMSyntaxError class TestItemImageDialog(TestItem): diff --git a/src/testium/interpreter/test_items/test_item_json_rpc/__init__.py b/src/testium/interpreter/test_items/test_item_json_rpc/__init__.py index b73eae2..2bb77f7 100644 --- a/src/testium/interpreter/test_items/test_item_json_rpc/__init__.py +++ b/src/testium/interpreter/test_items/test_item_json_rpc/__init__.py @@ -2,7 +2,7 @@ import sys import traceback from random import randint -from interpreter.utils.tum_except import ETUMSyntaxError +from lib.tum_except import ETUMSyntaxError from interpreter.test_items.test_item import TestItem, test_run from interpreter.test_items.test_result import TestResult, TestValue diff --git a/src/testium/interpreter/test_items/test_item_json_rpc/jsonrpc_adapters.py b/src/testium/interpreter/test_items/test_item_json_rpc/jsonrpc_adapters.py index c8eaff1..1a479d3 100644 --- a/src/testium/interpreter/test_items/test_item_json_rpc/jsonrpc_adapters.py +++ b/src/testium/interpreter/test_items/test_item_json_rpc/jsonrpc_adapters.py @@ -3,7 +3,7 @@ import socket import re import struct -from interpreter.utils.tum_except import ETUMRuntimeError +from lib.tum_except import ETUMRuntimeError import libs.testium as tm from libs.console import Console diff --git a/src/testium/interpreter/test_items/test_item_let.py b/src/testium/interpreter/test_items/test_item_let.py index 212c718..9f42dd2 100644 --- a/src/testium/interpreter/test_items/test_item_let.py +++ b/src/testium/interpreter/test_items/test_item_let.py @@ -5,7 +5,7 @@ import time from interpreter.test_items.test_item import (TestItem, test_run) from interpreter.test_items.test_result import (TestResult, TestValue) -from interpreter.utils.tum_except import ETUMSyntaxError +from lib.tum_except import ETUMSyntaxError import libs.testium as tm from interpreter.utils.constants import TestItemType as cst 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 a32fb1a..a3da782 100644 --- a/src/testium/interpreter/test_items/test_item_lua_func.py +++ b/src/testium/interpreter/test_items/test_item_lua_func.py @@ -4,12 +4,12 @@ import traceback import pprint import textwrap +from lib.tum_except import ETUMSyntaxError, ETUMRuntimeError from interpreter.test_items.test_item import TestItem, test_run from interpreter.test_items.test_result import TestValue import libs.testium as tm from interpreter.utils.lua_func_exec import LuaFuncExecEngine from interpreter.utils.api_srv import api_request -from interpreter.utils.tum_except import ETUMSyntaxError, ETUMRuntimeError from interpreter.utils.constants import TestItemType as cst diff --git a/src/testium/interpreter/test_items/test_item_msg_dialog.py b/src/testium/interpreter/test_items/test_item_msg_dialog.py index f071004..b0b7fb4 100644 --- a/src/testium/interpreter/test_items/test_item_msg_dialog.py +++ b/src/testium/interpreter/test_items/test_item_msg_dialog.py @@ -6,7 +6,7 @@ from interpreter.test_items.test_item import (TestItem, test_run) from interpreter.test_items.test_result import (TestValue) from interpreter.test_items.dialog_msg_files import msg_dialog from interpreter.utils.constants import TestItemType as cst -from interpreter.utils.tum_except import ETUMSyntaxError +from lib.tum_except import ETUMSyntaxError class TestItemMsgDialog(TestItem): """dialog_message item usage. diff --git a/src/testium/interpreter/test_items/test_item_note_dialog.py b/src/testium/interpreter/test_items/test_item_note_dialog.py index 1174a70..dbded8d 100644 --- a/src/testium/interpreter/test_items/test_item_note_dialog.py +++ b/src/testium/interpreter/test_items/test_item_note_dialog.py @@ -5,7 +5,7 @@ from multiprocessing import Process, Pipe from interpreter.test_items.test_item import (TestItem, test_run) from interpreter.test_items.test_result import (TestResult, TestValue) from interpreter.test_items.dialog_note_files import test_dialog -from interpreter.utils.tum_except import ETUMSyntaxError +from lib.tum_except import ETUMSyntaxError import libs.testium as tm from interpreter.utils.constants import TestItemType as cst diff --git a/src/testium/interpreter/test_items/test_item_py_func.py b/src/testium/interpreter/test_items/test_item_py_func.py index dcd1bc4..d4f1c2b 100644 --- a/src/testium/interpreter/test_items/test_item_py_func.py +++ b/src/testium/interpreter/test_items/test_item_py_func.py @@ -4,12 +4,12 @@ import time import pprint import textwrap +from lib.tum_except import ETUMSyntaxError, ETUMRuntimeError from interpreter.test_items.test_item import TestItem, test_run from interpreter.test_items.test_result import TestValue import libs.testium as tm from interpreter.utils.py_func_exec import PyFuncExecEngine from interpreter.utils.api_srv import api_request -from interpreter.utils.tum_except import ETUMSyntaxError, ETUMRuntimeError from interpreter.utils.constants import TestItemType as cst diff --git a/src/testium/interpreter/test_items/test_item_question_dialog.py b/src/testium/interpreter/test_items/test_item_question_dialog.py index 5b9d6e0..7a04995 100644 --- a/src/testium/interpreter/test_items/test_item_question_dialog.py +++ b/src/testium/interpreter/test_items/test_item_question_dialog.py @@ -7,7 +7,7 @@ from PySide6.QtWidgets import QMessageBox from interpreter.test_items.test_item import (TestItem, test_run) from interpreter.test_items.test_result import (TestResult, TestValue) from interpreter.test_items.dialog_question_files import question_dialog -from interpreter.utils.tum_except import ETUMSyntaxError +from lib.tum_except import ETUMSyntaxError from interpreter.utils.constants import TestItemType as cst class TestItemQuestionDialog(TestItem): diff --git a/src/testium/interpreter/test_items/test_item_report.py b/src/testium/interpreter/test_items/test_item_report.py index 8e0a585..b96f365 100644 --- a/src/testium/interpreter/test_items/test_item_report.py +++ b/src/testium/interpreter/test_items/test_item_report.py @@ -1,7 +1,7 @@ from interpreter.test_items.test_item import (TestItem, test_run) from interpreter.test_items.test_result import (TestValue) -from interpreter.utils.tum_except import ETUMSyntaxError +from lib.tum_except import ETUMSyntaxError from interpreter.utils.constants import TestItemType as cst from interpreter.test_report.test_report import Export diff --git a/src/testium/interpreter/test_items/test_item_run.py b/src/testium/interpreter/test_items/test_item_run.py index f26a03d..7b92e91 100644 --- a/src/testium/interpreter/test_items/test_item_run.py +++ b/src/testium/interpreter/test_items/test_item_run.py @@ -10,7 +10,7 @@ from interpreter.test_items.test_item import (TestItem, test_run) from interpreter.test_items.test_result import (TestValue) import libs.testium as tm from interpreter.utils.constants import TestItemType as cst -from interpreter.utils.tum_except import ETUMSyntaxError, ETUMRuntimeError +from lib.tum_except import ETUMSyntaxError, ETUMRuntimeError def nowInBetween(start, end): diff --git a/src/testium/interpreter/test_items/test_item_runtime_plot.py b/src/testium/interpreter/test_items/test_item_runtime_plot.py index 888f0f4..bcc8cde 100644 --- a/src/testium/interpreter/test_items/test_item_runtime_plot.py +++ b/src/testium/interpreter/test_items/test_item_runtime_plot.py @@ -4,7 +4,7 @@ import traceback from functools import wraps import libs.testium as tm -from interpreter.utils.tum_except import ETUMSyntaxError +from lib.tum_except import ETUMSyntaxError from interpreter.test_items.test_item import TestItem, test_run from interpreter.test_items.test_result import TestResult, TestValue from interpreter.test_items.item_actions import TestItemActions diff --git a/src/testium/interpreter/test_items/test_item_sleep.py b/src/testium/interpreter/test_items/test_item_sleep.py index 40a6b3a..dd22afb 100644 --- a/src/testium/interpreter/test_items/test_item_sleep.py +++ b/src/testium/interpreter/test_items/test_item_sleep.py @@ -7,7 +7,7 @@ from interpreter.test_items.test_item import (TestItem, test_run) from interpreter.test_items.test_result import (TestValue) from interpreter.test_items.dialog_sleep_files import dialog_sleep from interpreter.utils.constants import TestItemType as cst -from interpreter.utils.tum_except import ETUMSyntaxError, ETUMRuntimeError +from lib.tum_except import ETUMSyntaxError, ETUMRuntimeError class TestItemSleep(TestItem): """sleep item usage. diff --git a/src/testium/interpreter/test_items/test_item_tested_references.py b/src/testium/interpreter/test_items/test_item_tested_references.py index 09548cc..e39ad54 100644 --- a/src/testium/interpreter/test_items/test_item_tested_references.py +++ b/src/testium/interpreter/test_items/test_item_tested_references.py @@ -6,7 +6,7 @@ from interpreter.test_items.test_item import (TestItem, test_run) from interpreter.test_items.test_result import (TestResult, TestValue) from interpreter.test_items.tested_references_files import tested_refs_dialog import libs.testium as tm -from interpreter.utils.tum_except import ETUMSyntaxError +from lib.tum_except import ETUMSyntaxError from interpreter.utils.constants import TestItemType as cst class TestItemTestedRefsDialog(TestItem): diff --git a/src/testium/interpreter/test_items/test_item_unittest.py b/src/testium/interpreter/test_items/test_item_unittest.py index ed27f47..a3226cd 100644 --- a/src/testium/interpreter/test_items/test_item_unittest.py +++ b/src/testium/interpreter/test_items/test_item_unittest.py @@ -5,13 +5,13 @@ from unittest import (TestCase, TestSuite, TextTestRunner, from unittest.loader import defaultTestLoader import libs.testium as tm -from interpreter.utils.tum_except import (ETUMFileError) +from lib.tum_except import (ETUMFileError) from interpreter.utils.modules import load_source from interpreter.test_items.test_item import (TestItem, test_run, LOG_TEST_STOP, LOG_TEST_START) from interpreter.test_items.test_result import (TestResult, TestValue) from interpreter.test_items.test_item import test_data from interpreter.utils.constants import TestItemType as cst -from interpreter.utils.stdout_redirect import stdio_redir +from lib.stdout_redirect import stdio_redir class UnittestResult(TextTestResult): """Test result adapted for unittest test""" diff --git a/src/testium/interpreter/test_items/test_item_value_dialog.py b/src/testium/interpreter/test_items/test_item_value_dialog.py index 53341be..c38ece7 100644 --- a/src/testium/interpreter/test_items/test_item_value_dialog.py +++ b/src/testium/interpreter/test_items/test_item_value_dialog.py @@ -6,7 +6,7 @@ from interpreter.test_items.test_item import (TestItem, test_run) from interpreter.test_items.test_result import (TestResult, TestValue) from interpreter.test_items.dialog_value_files import test_dialog import libs.testium as tm -from interpreter.utils.tum_except import ETUMSyntaxError +from lib.tum_except import ETUMSyntaxError from interpreter.utils.constants import TestItemType as cst class TestItemValueDialog(TestItem): diff --git a/src/testium/interpreter/test_items/test_result.py b/src/testium/interpreter/test_items/test_result.py index 9b5ab0d..d626d4d 100644 --- a/src/testium/interpreter/test_items/test_result.py +++ b/src/testium/interpreter/test_items/test_result.py @@ -1,4 +1,4 @@ -from interpreter.utils.tum_except import (ETUMRuntimeError) +from lib.tum_except import (ETUMRuntimeError) from datetime import datetime from enum import Enum diff --git a/src/testium/interpreter/test_report/test_report.py b/src/testium/interpreter/test_report/test_report.py index 2d1415c..0a03c08 100644 --- a/src/testium/interpreter/test_report/test_report.py +++ b/src/testium/interpreter/test_report/test_report.py @@ -3,8 +3,8 @@ from functools import wraps import sqlite3 from time import (time, sleep) import traceback -from interpreter.utils.tum_except import (ETUMRuntimeError, ETUMSyntaxError) -from interpreter.utils.stdout_redirect import stdio_redir +from lib.tum_except import (ETUMRuntimeError, ETUMSyntaxError) +from lib.stdout_redirect import stdio_redir from interpreter.utils.params import (expanse) from interpreter.utils.paths import prepare_file_to_save import interpreter.utils.constants as cst diff --git a/src/testium/interpreter/test_set.py b/src/testium/interpreter/test_set.py index afd3fc5..03643de 100644 --- a/src/testium/interpreter/test_set.py +++ b/src/testium/interpreter/test_set.py @@ -3,14 +3,14 @@ import datetime from queue import Queue from interpreter.utils.params import expanse import libs.testium as tm -from interpreter.utils.tum_except import ( +from lib.tum_except import ( ETUMSyntaxError, ) import interpreter.utils.settings as prefs from interpreter.test_report.test_report import TestReport from interpreter.utils.py_func_exec import PyFuncExecEngine from interpreter.utils.api_srv import api_request -from interpreter.utils.tum_except import ETUMRuntimeError +from lib.tum_except import ETUMRuntimeError from interpreter.utils.constants import TestItemType as cst_type import interpreter.utils.constants as cst from interpreter.utils.constants import TEST_TYPE_LIST diff --git a/src/testium/interpreter/utils/api_srv.py b/src/testium/interpreter/utils/api_srv.py index c04cc3c..76af6d3 100644 --- a/src/testium/interpreter/utils/api_srv.py +++ b/src/testium/interpreter/utils/api_srv.py @@ -1,4 +1,4 @@ -from interpreter.utils.api import SUPPORTED_API +from lib.api import SUPPORTED_API import libs.testium as tm diff --git a/src/testium/interpreter/utils/eval.py b/src/testium/interpreter/utils/eval.py index 23f9809..a3e9a42 100644 --- a/src/testium/interpreter/utils/eval.py +++ b/src/testium/interpreter/utils/eval.py @@ -1,6 +1,6 @@ import libs.testium as tm from interpreter.utils.py_eval import eval_exec -from interpreter.utils.tum_except import ETUMSyntaxError, ETUMRuntimeError +from lib.tum_except import ETUMSyntaxError, ETUMRuntimeError def evaluate(val, **replacement_dict): diff --git a/src/testium/interpreter/utils/include.py b/src/testium/interpreter/utils/include.py index bb8e1e6..65e5fee 100644 --- a/src/testium/interpreter/utils/include.py +++ b/src/testium/interpreter/utils/include.py @@ -2,7 +2,7 @@ import yaml import os.path import libs.testium as tm from interpreter.utils.params import expanse -from interpreter.utils.tum_except import ETUMFileError +from lib.tum_except import ETUMFileError from interpreter.utils.template import template_to_test from copy import copy from interpreter.utils.globdict import global_dict diff --git a/src/testium/interpreter/utils/lua_func_exec.py b/src/testium/interpreter/utils/lua_func_exec.py index 9d4a537..eec2863 100644 --- a/src/testium/interpreter/utils/lua_func_exec.py +++ b/src/testium/interpreter/utils/lua_func_exec.py @@ -1,6 +1,6 @@ from interpreter.utils.lua_process import LuaProcessBase -from interpreter.utils.tum_except import ETUMRuntimeError +from lib.tum_except import ETUMRuntimeError from interpreter.test_items.test_result import TestValue diff --git a/src/testium/interpreter/utils/lua_process.py b/src/testium/interpreter/utils/lua_process.py index d1db704..516a210 100644 --- a/src/testium/interpreter/utils/lua_process.py +++ b/src/testium/interpreter/utils/lua_process.py @@ -5,9 +5,9 @@ import subprocess import socket import libs.testium as tm +from lib.jrpc import JsonRpcClient from interpreter.utils.paths import subproc_path -from interpreter.utils.tum_except import ETUMRuntimeError -from interpreter.utils.jrpc import JsonRpcClient +from lib.tum_except import ETUMRuntimeError from interpreter.utils.paths import sys_app_path_lin, sys_app_path_win def _lua_version(path: str): diff --git a/src/testium/interpreter/utils/params.py b/src/testium/interpreter/utils/params.py index 4c39ea4..88372bf 100644 --- a/src/testium/interpreter/utils/params.py +++ b/src/testium/interpreter/utils/params.py @@ -1,5 +1,5 @@ import interpreter.utils.globdict as globdict -from interpreter.utils.tum_except import ETUMSyntaxError, ETUMRuntimeError +from lib.tum_except import ETUMSyntaxError, ETUMRuntimeError glob_eval_func = None diff --git a/src/testium/interpreter/utils/paths.py b/src/testium/interpreter/utils/paths.py index bb4fbcb..9b8e929 100644 --- a/src/testium/interpreter/utils/paths.py +++ b/src/testium/interpreter/utils/paths.py @@ -12,7 +12,6 @@ def testium_path(): if getattr(sys, 'frozen', False): # Exécuté depuis le .exe - print(f"Path: {sys._MEIPASS}") return sys._MEIPASS tp = inspect.getfile(inspect.getmodule(testium)) @@ -21,7 +20,6 @@ def testium_path(): def subproc_path(): if getattr(sys, 'frozen', False): # Exécuté depuis le .exe - print(f"Path: {sys._MEIPASS}") return sys._MEIPASS tp = inspect.getfile(inspect.getmodule(testium)) diff --git a/src/testium/interpreter/utils/py_eval.py b/src/testium/interpreter/utils/py_eval.py index a96c530..76eec6f 100644 --- a/src/testium/interpreter/utils/py_eval.py +++ b/src/testium/interpreter/utils/py_eval.py @@ -1,5 +1,5 @@ from interpreter.utils.py_process import PyProcessBase -from interpreter.utils.tum_except import ETUMRuntimeError +from lib.tum_except import ETUMRuntimeError import libs.testium as tm diff --git a/src/testium/interpreter/utils/py_func_exec.py b/src/testium/interpreter/utils/py_func_exec.py index 5f81d3d..1628824 100644 --- a/src/testium/interpreter/utils/py_func_exec.py +++ b/src/testium/interpreter/utils/py_func_exec.py @@ -1,6 +1,6 @@ from interpreter.utils.py_process import PyProcessBase -from interpreter.utils.tum_except import ETUMRuntimeError +from lib.tum_except import ETUMRuntimeError from interpreter.test_items.test_result import TestValue diff --git a/src/testium/interpreter/utils/py_process.py b/src/testium/interpreter/utils/py_process.py index 1666de8..530c92e 100644 --- a/src/testium/interpreter/utils/py_process.py +++ b/src/testium/interpreter/utils/py_process.py @@ -3,10 +3,10 @@ import shutil import sys import subprocess import socket +from lib.jrpc import JsonRpcClient import libs.testium as tm from interpreter.utils.paths import sys_app_path_lin, sys_app_path_win -from interpreter.utils.tum_except import ETUMRuntimeError -from interpreter.utils.jrpc import JsonRpcClient +from lib.tum_except import ETUMRuntimeError from interpreter.utils.paths import testium_path, subproc_path diff --git a/src/testium/interpreter/utils/settings.py b/src/testium/interpreter/utils/settings.py index 3941a06..72e1c55 100644 --- a/src/testium/interpreter/utils/settings.py +++ b/src/testium/interpreter/utils/settings.py @@ -2,7 +2,7 @@ import os import configparser import json import platform -from interpreter.utils.tum_except import ETUMRuntimeError +from lib.tum_except import ETUMRuntimeError SettingsCompany = 'Testium' SettingsApplication = 'testium' diff --git a/src/testium/interpreter/utils/template.py b/src/testium/interpreter/utils/template.py index c1a8171..76ff3b5 100644 --- a/src/testium/interpreter/utils/template.py +++ b/src/testium/interpreter/utils/template.py @@ -4,7 +4,7 @@ from jinja2 import Template from jinja2.exceptions import TemplateSyntaxError, TemplateError, UndefinedError from tempfile import TemporaryFile from interpreter.utils.yaml_load import print_yaml -from interpreter.utils.tum_except import ETUMSyntaxError +from lib.tum_except import ETUMSyntaxError def template_to_test(filename: str, params: list): diff --git a/src/testium/interpreter/utils/test_ctrl.py b/src/testium/interpreter/utils/test_ctrl.py index d7c87be..d5e1426 100644 --- a/src/testium/interpreter/utils/test_ctrl.py +++ b/src/testium/interpreter/utils/test_ctrl.py @@ -1,6 +1,6 @@ from multiprocessing import Queue from queue import Empty -from interpreter.utils.tum_except import ETUMRuntimeError +from lib.tum_except import ETUMRuntimeError class TestSetController: diff --git a/src/testium/interpreter/utils/test_init.py b/src/testium/interpreter/utils/test_init.py index 77423ad..0d77a02 100644 --- a/src/testium/interpreter/utils/test_init.py +++ b/src/testium/interpreter/utils/test_init.py @@ -13,7 +13,7 @@ import interpreter.utils.settings as prefs from interpreter.utils.paths import testium_path from interpreter.utils.yaml_load import yaml_load from interpreter.utils import clear_recursively -from interpreter.utils.tum_except import ETUMSyntaxError +from lib.tum_except import ETUMSyntaxError from interpreter.utils.params import expanse, eval_func_init from interpreter.utils.eval import evaluate from interpreter.utils.version import ( diff --git a/src/testium/interpreter/utils/yaml_load.py b/src/testium/interpreter/utils/yaml_load.py index 5c1619a..bcd273c 100644 --- a/src/testium/interpreter/utils/yaml_load.py +++ b/src/testium/interpreter/utils/yaml_load.py @@ -2,7 +2,7 @@ from yaml.parser import ParserError from yaml import load, Loader from yaml.scanner import ScannerError from libs.testium import print_debug -from interpreter.utils.tum_except import ETUMSyntaxError +from lib.tum_except import ETUMSyntaxError import io diff --git a/src/testium/libs/runtime_plot.py b/src/testium/libs/runtime_plot.py index e8d1700..42fc6df 100644 --- a/src/testium/libs/runtime_plot.py +++ b/src/testium/libs/runtime_plot.py @@ -18,7 +18,7 @@ from datetime import datetime, timedelta, timezone import libs.testium as tm from interpreter.test_items.test_result import TestValue -from interpreter.utils.tum_except import ETUMRuntimeError +from lib.tum_except import ETUMRuntimeError from interpreter.utils.py_func_exec import PyFuncExecEngine from interpreter.utils.api_srv import api_request from interpreter.utils.eval import post_evaluate diff --git a/src/testium/libs/testium.py b/src/testium/libs/testium.py index 05990c0..acce435 100644 --- a/src/testium/libs/testium.py +++ b/src/testium/libs/testium.py @@ -4,7 +4,7 @@ import sys import textwrap from time import monotonic import interpreter.utils.globdict as globdict -from interpreter.utils.tum_except import (ETUMSyntaxError) +from lib.tum_except import (ETUMSyntaxError) ############################################################################### # Console helper functions diff --git a/src/testium/main_win/test_tree.py b/src/testium/main_win/test_tree.py index 570d3bf..1cdf54d 100644 --- a/src/testium/main_win/test_tree.py +++ b/src/testium/main_win/test_tree.py @@ -10,7 +10,7 @@ from PySide6.QtGui import (QFont, QFontInfo) from time import (time) from main_win.test_tree_items.common import (TEST_COLS, TEST_COLS_WITH_TIME) -from interpreter.utils.tum_except import (ETUMFileError, ETUMSyntaxError) +from lib.tum_except import (ETUMFileError, ETUMSyntaxError) from interpreter.utils.test_ctrl import TestSetController from main_win.test_tree_items.test_tree_git import QTestTreeItemGit diff --git a/src/testium/main_win/testium_win.py b/src/testium/main_win/testium_win.py index 29c60d7..366e9ec 100755 --- a/src/testium/main_win/testium_win.py +++ b/src/testium/main_win/testium_win.py @@ -36,7 +36,7 @@ from main_win.f1_win.d_f1_win import DialogF1 from main_win.test_tree import QTestTree from main_win.test_run.thread_output import ThreadTestOutput -from interpreter.utils.string_queue import StringQueue +from lib.string_queue import StringQueue from interpreter.process import TestProcess from interpreter.utils.test_ctrl import TestSetController from interpreter.utils.icons import icon_prefix @@ -44,14 +44,14 @@ from interpreter.utils.icons import icon_prefix from main_win.test_run.outlog import OutLog from main_win.test_run.test_run import ThreadTestStatus import interpreter.utils.settings as prefs -from interpreter.utils.stdout_redirect import stdio_redir +from lib.stdout_redirect import stdio_redir import libs.testium as tm from interpreter.utils.version import get_testium_version from interpreter.utils.test_init import ( env_init, locate_report_file, ) -from interpreter.utils.tum_except import ETUMFileError, ETUMRuntimeError +from lib.tum_except import ETUMFileError, ETUMRuntimeError class MainWindow(QMainWindow, Ui_MainWindow):