Skip to content

T_OS_EXEC_ENV is added. #137

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dmitry-lipetsk merged 1 commit into from
Sep 17, 2026
Merged

T_OS_EXEC_ENV is added. #137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/local_ops.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
from .os_ops import T_OS_IO
from .os_ops import T_OS_IO_ID
from .os_ops import T_OS_RUN_INPUT
from .os_ops import T_OS_EXEC_ENV
from .raise_error import RaiseError
from .helpers import Helpers

Expand Down Expand Up @@ -509,7 +510,7 @@ def popen(
stdin: typing.Optional[T_OS_IO_ID] = subprocess.PIPE,
stdout: typing.Optional[T_OS_IO_ID] = subprocess.PIPE,
stderr: typing.Optional[T_OS_IO_ID] = subprocess.PIPE,
exec_env: typing.Optional[OsOperations.T_EXEC_ENV] = None,
exec_env: typing.Optional[T_OS_EXEC_ENV] = None,
cwd: typing.Optional[str] = None
) -> OsProcessController:
assert text is None or type(text) is bool
Expand Down Expand Up @@ -576,7 +577,7 @@ def run(
stdin: typing.Optional[T_OS_IO_ID] = subprocess.PIPE,
stdout: typing.Optional[T_OS_IO_ID] = subprocess.PIPE,
stderr: typing.Optional[T_OS_IO_ID] = subprocess.PIPE,
exec_env: typing.Optional[OsOperations.T_EXEC_ENV] = None,
exec_env: typing.Optional[T_OS_EXEC_ENV] = None,
cwd: typing.Optional[str] = None,
timeout: typing.Optional[T_OS_TIMEOUT] = None,
check: bool = True,
Expand Down
7 changes: 3 additions & 4 deletions src/os_ops.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
from .types import T_OS_IO
from .types import T_OS_IO_ID
from .types import T_OS_RUN_INPUT
from .types import T_OS_EXEC_ENV
from .raise_error import RaiseError

import locale
Expand Down Expand Up @@ -204,8 +205,6 @@ def exec_command(
assert cwd is None or type(cwd) is str
RaiseError.MethodIsNotImplemented(__class__, "exec_command")

T_EXEC_ENV = typing.Dict[str, typing.Optional[str]]

def popen(
self,
cmd: T_OS_CMD,
Expand All @@ -215,7 +214,7 @@ def popen(
stdin: typing.Optional[T_OS_IO_ID] = subprocess.PIPE,
stdout: typing.Optional[T_OS_IO_ID] = subprocess.PIPE,
stderr: typing.Optional[T_OS_IO_ID] = subprocess.PIPE,
exec_env: typing.Optional[T_EXEC_ENV] = None,
exec_env: typing.Optional[T_OS_EXEC_ENV] = None,
cwd: typing.Optional[str] = None
) -> OsProcessController:
assert type(cmd) is str or type(cmd) is list
Expand All @@ -239,7 +238,7 @@ def run(
stdin: typing.Optional[T_OS_IO_ID] = subprocess.PIPE,
stdout: typing.Optional[T_OS_IO_ID] = subprocess.PIPE,
stderr: typing.Optional[T_OS_IO_ID] = subprocess.PIPE,
exec_env: typing.Optional[T_EXEC_ENV] = None,
exec_env: typing.Optional[T_OS_EXEC_ENV] = None,
cwd: typing.Optional[str] = None,
timeout: typing.Optional[T_OS_TIMEOUT] = None,
check: bool = True,
Expand Down
9 changes: 5 additions & 4 deletions src/remote_ops.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
from .os_ops import T_OS_IO
from .os_ops import T_OS_IO_ID
from .os_ops import T_OS_RUN_INPUT
from .os_ops import T_OS_EXEC_ENV
from .raise_error import RaiseError
from .helpers import Helpers
from .static_config import OsOperationStaticConfig
Expand Down Expand Up @@ -544,7 +545,7 @@ def popen(
stdin: typing.Optional[T_OS_IO_ID] = subprocess.PIPE,
stdout: typing.Optional[T_OS_IO_ID] = subprocess.PIPE,
stderr: typing.Optional[T_OS_IO_ID] = subprocess.PIPE,
exec_env: typing.Optional[OsOperations.T_EXEC_ENV] = None,
exec_env: typing.Optional[T_OS_EXEC_ENV] = None,
cwd: typing.Optional[str] = None
) -> OsProcessController:
assert type(cmd) is str or type(cmd) is list
Expand Down Expand Up @@ -743,7 +744,7 @@ def run(
stdin: typing.Optional[T_OS_IO_ID] = subprocess.PIPE,
stdout: typing.Optional[T_OS_IO_ID] = subprocess.PIPE,
stderr: typing.Optional[T_OS_IO_ID] = subprocess.PIPE,
exec_env: typing.Optional[OsOperations.T_EXEC_ENV] = None,
exec_env: typing.Optional[T_OS_EXEC_ENV] = None,
cwd: typing.Optional[str] = None,
timeout: typing.Optional[T_OS_TIMEOUT] = None,
check: bool = True,
Expand Down Expand Up @@ -1781,7 +1782,7 @@ def _transport_popen(
stdin: typing.Optional[T_OS_IO_ID] = subprocess.PIPE,
stdout: typing.Optional[T_OS_IO_ID] = subprocess.PIPE,
stderr: typing.Optional[T_OS_IO_ID] = subprocess.PIPE,
exec_env: typing.Optional[OsOperations.T_EXEC_ENV] = None,
exec_env: typing.Optional[T_OS_EXEC_ENV] = None,
cwd: typing.Optional[str] = None
) -> subprocess.Popen:
assert type(cmd) in [str, list]
Expand Down Expand Up @@ -1872,7 +1873,7 @@ def _transport_run(
stdin: typing.Optional[T_OS_IO_ID] = subprocess.PIPE,
stdout: typing.Optional[T_OS_IO_ID] = subprocess.PIPE,
stderr: typing.Optional[T_OS_IO_ID] = subprocess.PIPE,
exec_env: typing.Optional[OsOperations.T_EXEC_ENV] = None,
exec_env: typing.Optional[T_OS_EXEC_ENV] = None,
cwd: typing.Optional[str] = None,
check: bool = True,
) -> tagTransportRunResult:
Expand Down
1 change: 1 addition & 0 deletions src/types.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@
T_OS_IO = typing.IO[typing.Any]
T_OS_IO_ID = typing.Union[int, T_OS_IO]
T_OS_RUN_INPUT = typing.Union[str, bytes]
T_OS_EXEC_ENV = typing.Dict[str, typing.Optional[str]]
17 changes: 9 additions & 8 deletions tests/test_os_ops_common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

from src.os_ops import OsProcessController
from src.os_ops import OsCommandResult
from src.os_ops import T_OS_EXEC_ENV
from src.exceptions import ExecTimeoutException

import os
Expand Down Expand Up @@ -4874,7 +4875,7 @@ def test_popen_set_env(

os_ops = os_ops_descr.os_ops

envs: OsOperations.T_EXEC_ENV = {
envs: T_OS_EXEC_ENV = {
"AAA": "abcdefg",
}

Expand Down Expand Up @@ -4957,7 +4958,7 @@ def test_popen_unset_env(
s = controller.stdout.read()
assert s != ""

envs: OsOperations.T_EXEC_ENV = {
envs: T_OS_EXEC_ENV = {
"PATH": None,
}

Expand Down Expand Up @@ -5014,7 +5015,7 @@ def test_popen_unset_env_of_os_ops(
s = controller.stderr.read()
assert s == ""

envs: OsOperations.T_EXEC_ENV = {
envs: T_OS_EXEC_ENV = {
"AAA": None,
}

Expand Down Expand Up @@ -5071,7 +5072,7 @@ def test_popen_replace_env_of_os_ops(
s = controller.stderr.read()
assert s == ""

envs: OsOperations.T_EXEC_ENV = {
envs: T_OS_EXEC_ENV = {
"AAA": "xyz",
}

Expand Down Expand Up @@ -5912,7 +5913,7 @@ def test_run_set_env(

os_ops = os_ops_descr.os_ops

envs: OsOperations.T_EXEC_ENV = {
envs: T_OS_EXEC_ENV = {
"AAA": "abcdefg",
}

Expand Down Expand Up @@ -5985,7 +5986,7 @@ def test_run_unset_env(
assert exec_r.stdout is not None
assert exec_r.stdout != ""

envs: OsOperations.T_EXEC_ENV = {
envs: T_OS_EXEC_ENV = {
"PATH": None,
}

Expand Down Expand Up @@ -6035,7 +6036,7 @@ def test_run_unset_env_of_os_ops(
s = exec_r.stderr
assert s == ""

envs: OsOperations.T_EXEC_ENV = {
envs: T_OS_EXEC_ENV = {
"AAA": None,
}

Expand Down Expand Up @@ -6091,7 +6092,7 @@ def test_run_replace_env_of_os_ops(
s = exec_r.stderr
assert s == ""

envs: OsOperations.T_EXEC_ENV = {
envs: T_OS_EXEC_ENV = {
"AAA": "xyz",
}

Expand Down