ae-shell 0.3.16__tar.gz → 0.3.17__tar.gz

{ae_shell-0.3.16/ae_shell.egg-info → ae_shell-0.3.17}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ae_shell
-Version: 0.3.16
+Version: 0.3.17
 Summary: ae namespace module portion shell: shell execution and environment helpers
 Home-page: https://gitlab.com/ae-group/ae_shell
 Author: AndiEcker
@@ -64,13 +64,13 @@ Dynamic: summary
 
 <!-- THIS FILE IS EXCLUSIVELY MAINTAINED by the project ae.ae v0.3.110 -->
 <!-- THIS FILE IS EXCLUSIVELY MAINTAINED by the project aedev.namespace_root_tpls v0.3.33 -->
-# shell 0.3.16
+# shell 0.3.17
 
 [![GitLab develop](https://img.shields.io/gitlab/pipeline/ae-group/ae_shell/develop?logo=python)](
     https://gitlab.com/ae-group/ae_shell)
 [![LatestPyPIrelease](
-    https://img.shields.io/gitlab/pipeline/ae-group/ae_shell/release0.3.16?logo=python)](
-    https://gitlab.com/ae-group/ae_shell/-/tree/release0.3.16)
+    https://img.shields.io/gitlab/pipeline/ae-group/ae_shell/release0.3.17?logo=python)](
+    https://gitlab.com/ae-group/ae_shell/-/tree/release0.3.17)
 [![PyPIVersions](https://img.shields.io/pypi/v/ae_shell)](
     https://pypi.org/project/ae-shell/#history)
 

{ae_shell-0.3.16 → ae_shell-0.3.17}/README.md

@@ -1,12 +1,12 @@
 <!-- THIS FILE IS EXCLUSIVELY MAINTAINED by the project ae.ae v0.3.110 -->
 <!-- THIS FILE IS EXCLUSIVELY MAINTAINED by the project aedev.namespace_root_tpls v0.3.33 -->
-# shell 0.3.16
+# shell 0.3.17
 
 [![GitLab develop](https://img.shields.io/gitlab/pipeline/ae-group/ae_shell/develop?logo=python)](
     https://gitlab.com/ae-group/ae_shell)
 [![LatestPyPIrelease](
-    https://img.shields.io/gitlab/pipeline/ae-group/ae_shell/release0.3.16?logo=python)](
-    https://gitlab.com/ae-group/ae_shell/-/tree/release0.3.16)
+    https://img.shields.io/gitlab/pipeline/ae-group/ae_shell/release0.3.17?logo=python)](
+    https://gitlab.com/ae-group/ae_shell/-/tree/release0.3.17)
 [![PyPIVersions](https://img.shields.io/pypi/v/ae_shell)](
     https://pypi.org/project/ae-shell/#history)
 

{ae_shell-0.3.16 → ae_shell-0.3.17}/ae/shell.py

@@ -5,17 +5,19 @@ shell execution and environment helpers
 this module is designed to provide a comprehensive set of constants and helper functions
 to manage shell printouts, OS environment variables and to execute shell commands.
 
-- :func:`debug_or_verbose`: checks if the application is running in debug or verbose mode.
-- :func:`get_domain_user_var`: retrieves an OS environment variable value for a specific domain and/or user.
-- :func:`hint`: provides a hint message for console printouts based on the provided arguments.
-- :func:`in_os_env`: context manager to temporarily add environment variables from the ``.env`` files onto `os.environ`.
-- :func:`mask_token`: hide/mask tokens in a text block, to prevent to show them in logs and printouts.
-- :func:`sh_exec`: execute command in the current working directory of the OS console/shell.
-- :func:`sh_exit_if_exec_err`: extended version of :func:`sh_exec` with automatically checks for errors
-  after a command is executed and handles application termination gracefully.
-
-- :data:`STDERR_BEG_MARKER`: marker used in the console output for the beginning of merged-in stderr output.
-- :data:`STDERR_END_MARKER`: marker used in the console output for the end of merged-in stderr output.
+* :func:`debug_or_verbose`: checks if the application is running in debug or verbose mode.
+* :func:`get_domain_user_var`: retrieves an OS environment variable value for a specific domain and/or user.
+* :func:`hint`: provides a hint message for console printouts based on the provided arguments.
+* :func:`in_os_env`: context manager to temporarily add environment variables from the ``.env`` files onto `os.environ`.
+* :func:`mask_token`: hide/mask tokens in a text block, to prevent to show them in logs and printouts.
+* :func:`output_line_split`: decode and split the specified shell/console output streams into line chunks.
+* :func:`output_zero_split`: decode and split the specified shell/console output streams separated by `NUL` (\\0) chars.
+* :func:`sh_exec`: execute command in the current working directory of the OS console/shell.
+* :func:`sh_exit_if_exec_err`: extended version of :func:`sh_exec` with automatically checks for errors
+  after a command is executed and handles application shutdown/termination gracefully.
+
+* :data:`STDERR_BEG_MARKER`: marker used in the console/shell printouts for the beginning of merged-in stderr output.
+* :data:`STDERR_END_MARKER`: marker used in the console/shell printouts for the end of merged-in stderr output.
 """
 import os
 import shlex
@@ -25,20 +27,20 @@ from collections.abc import Callable, Iterable, Iterator, MutableMapping
 from contextlib import contextmanager
 from typing import Any, cast, overload
 
-from ae.base import UNSET, dummy_function, env_str, norm_name                               # type: ignore
-from ae.system import active_venv, load_env_var_defaults                                    # type: ignore
+from ae.base import UNSET, UnsetType, dummy_function, env_str, norm_name                    # type: ignore
+from ae.system import load_env_var_defaults, os_env_venv                                    # type: ignore
 from ae.core import main_app_instance, AppBase                                              # type: ignore
 from ae.console import MAIN_SECTION_NAME, ConsoleApp                                        # type: ignore
 
 
-__version__ = '0.3.16'
+__version__ = '0.3.17'
 
 
 STDERR_BEG_MARKER = 'vvv   STDERR   vvv'  #: :paramref:`ae.shell.sh_exec.output_lines` begin stderr lines marker
 STDERR_END_MARKER = '^^^   STDERR   ^^^'  #: end stderr lines marker in :paramref:`ae.shell.sh_exec.output_lines`
 
 
-def debug_or_verbose(app_obj: ConsoleApp | None = None) -> bool:
+def debug_or_verbose(app_obj: ConsoleApp | UnsetType | None = None) -> bool:
     """ determine if the current app runs in debug|verbose mode, while preventing early .get_option() call an app init.
 
     :param app_obj:             optional ConsoleApp instance (def=main_app_instance()).
@@ -52,9 +54,11 @@ def debug_or_verbose(app_obj: ConsoleApp | None = None) -> bool:
         the debug mode can be activated via the :class:`~ae.console.ConsoleApp` option `debug_level`, specified either
         in a config file or via the command line options. the verbose mode get activated via the `more_verbose`  option.
     """
-    app_obj = app_obj or main_app_instance()
+    if app_obj is None:
+        app_obj = main_app_instance()
+
     return bool(
-        not app_obj                                         # prevent exception in early app startup and in test runs
+        not isinstance(app_obj, AppBase)                    # prevent exception in early app startup and unit test runs
         or app_obj.debug                                    # main_app.debug_level > DEBUG_LEVEL_DISABLED
         or not isinstance(app_obj, ConsoleApp)              # return True for pure ae.core.AppBase instances
         or not getattr(app_obj, '_parsed_arguments', None)  # ConsoleApp._parsed_arguments args Namespace not created
@@ -101,10 +105,10 @@ def hint(command: str, action: Callable | str, message_suffix: str = "") -> str:
 
 @contextmanager
 def in_os_env(start_dir: str = "") -> Iterator[MutableMapping[str, str]]:
-    """ temporarily add environment variables from the dotenv files that not exist in os.environ to it.
+    """ temporarily add environment variables from the ``.env`` files that not exist in :attr:`os.environ` to it.
 
     :param start_dir:           path to the folder where the first dotenv file (with the highest priority) is stored.
-    :return:                    yielding the os env variables that got added to os.environ in this temporary context.
+    :return:                    yielding the OS env variables that got added to os.environ in this temporary context.
     """
     loaded_env_vars = load_env_var_defaults(start_dir, os.environ)
     try:
@@ -122,6 +126,10 @@ def mask_token(text: str) -> str: ...
 def mask_token(text: list[str]) -> list[str]: ...
 
 
+@overload
+def mask_token(text: str | list[str]) -> str | list[str]: ...
+
+
 def mask_token(text: str | list[str]) -> str | list[str]:
     """ hide most parts of any Codeberg/GitHub/GitHub URL tokens found in the specified text/-lines.
 
@@ -150,10 +158,29 @@ def mask_token(text: str | list[str]) -> str | list[str]:
     return lines[0] if is_str_arg else lines
 
 
+def output_line_split(output: bytes) -> list[str]:
+    """ decode and split the specified shell/console output streams into line chunks.
+
+    :param output:              captured stdout/stderr output from an executed OS shell command.
+    :return:                    list of non-empty shell/console output lines, decoded into string.
+    """
+    return [line for line in output.decode().splitlines() if line.strip()]
+
+
+def output_zero_split(output: bytes) -> list[str]:
+    """ decode and split the specified shell/console output streams separated by `NUL` (\\0) characters.
+
+    :param output:              captured stdout/stderr output from an executed OS shell command (e.g. `env -0`).
+    :return:                    list of non-empty shell/console output chunks, decoded into string.
+    """
+    return [line for line in output.decode().split('\0') if line.strip()]
+
+
 # pylint: disable-next=too-many-arguments,too-many-positional-arguments
 def sh_exec(command_line: str, extra_args: Iterable[str] = (), console_input: str = "",
-            output_lines: list[str] | None = None, app_obj: AppBase | None = None, shell: bool = False,
-            env_vars: dict[str, str] | None = None, err_redirect: int | None = None) -> int:
+            output_lines: list[str] | None = None, app_obj: AppBase | UnsetType | None = None, shell: bool = False,
+            env_vars: dict[str, str] | UnsetType | None = UNSET, err_redirect: int | None = None,
+            decoder_splitter: Callable[[bytes], list[str]] = output_line_split) -> int:
     """ execute command in the current working directory of the OS console/shell.
 
     :param command_line:        command line string to execute on the console/shell. could contain command line args
@@ -170,8 +197,18 @@ def sh_exec(command_line: str, extra_args: Iterable[str] = (), console_input: st
                                 specify :data:`~ae.base.UNSET` to suppress any printing/logging output.
     :param shell:               pass True to execute command in the default OS shell (for more info check the
                                 documentation of the parameter :paramref:`~subprocess.run.shell` of the
-                                :meth:`subprocess.run` function).
+                                :func:`subprocess.run` function).
     :param env_vars:            OS shell environment variables to be used instead of the console/bash defaults.
+                                if not specified or `UNSET` then an isolated dict copy of :attr:`os.environ` will get
+                                passed onto :func:`subprocess.run` in order to avoid potential runtime errors, if the
+                                parent process (or a concurrent thread) modifies :attr:`os.environ` during the creation
+                                of the subprocess. Additionally, with the convertion of the special :class:`_Environ`
+                                object into a standard dict, the execution will result slightly faster and avoids
+                                any special method overrides interfering with the child process creation. it also is
+                                preventing rare errors with multithread-processes that try to change OS env variable
+                                (e.g. Conda in relation with pip could lead to raise a `RuntimeError: dictionary
+                                changed size during iteration` exception).
+                                specify `None` in order to use the original/unisolated :attr:`os.environ` object.
     :param err_redirect:        this argument controls if and how the output of the executed command onto the console
                                 stderr stream gets captured/redirected. it gets passed directly onto the
                                 :paramref:`~subprocess.run.stderr` argument of :func:`subprocess.run` function.
@@ -184,18 +221,23 @@ def sh_exec(command_line: str, extra_args: Iterable[str] = (), console_input: st
                                 specify :data:`subprocess.DEVNULL` to hide any stderr output onto the console/shell
                                 as well as in the :paramref:`.output_lines` list. if you specify `None`
                                 (the default argument) then the stderr output will be printed only on the console.
+    :param decoder_splitter:    callable to decode and split the output from the stdout/stderr streams into a list
+                                of string chunks/lines, to be added to and returned by :paramref:`.output_lines`.
     :return:                    return code of the executed command or 126 if execution raised any other exception.
     """
-    all_args = command_line + (" " + " ".join(extra_args) if extra_args else "") if shell else (
-            shlex.split(command_line) + list(extra_args))
-    # noinspection PyTypeChecker
+    if shell:
+        all_args: str | list[str] = command_line + (" " + " ".join(extra_args) if extra_args else "")
+    else:
+        all_args = shlex.split(command_line) + list(extra_args)
     masked_args = mask_token(all_args)
     if app_obj is None:
         app_obj = main_app_instance()
-    print_out = app_obj.po if app_obj else dummy_function if app_obj is UNSET else print
-    debug_out = app_obj.dpo if app_obj else dummy_function if app_obj is UNSET else print
+    print_out = dummy_function if app_obj is UNSET else app_obj.print_out if isinstance(app_obj, AppBase) else print
+    debug_out = dummy_function if app_obj is UNSET else app_obj.debug_out if isinstance(app_obj, AppBase) else print
+    if env_vars is UNSET:
+        env_vars = os.environ.copy()
 
-    debug_out(f"    . executing {masked_args} at {os.getcwd()=} in {active_venv()=}")
+    debug_out(f"    . executing {masked_args} at {os.getcwd()=} in {os_env_venv()=}")
     result: subprocess.CompletedProcess | subprocess.CalledProcessError     # having: stdout/stderr/returncode
     try:
         result = subprocess.run(all_args,
@@ -214,10 +256,10 @@ def sh_exec(command_line: str, extra_args: Iterable[str] = (), console_input: st
 
     if isinstance(output_lines, list):
         if result.stdout:
-            output_lines.extend([line for line in result.stdout.decode().splitlines() if line.strip()])
+            output_lines.extend(decoder_splitter(result.stdout))
         if err_redirect == subprocess.PIPE and result.stderr:
             output_lines.append(STDERR_BEG_MARKER)
-            output_lines.extend([line for line in result.stderr.decode().splitlines() if line.strip()])
+            output_lines.extend(decoder_splitter(result.stderr))
             output_lines.append(STDERR_END_MARKER)
 
     return result.returncode
@@ -226,8 +268,10 @@ def sh_exec(command_line: str, extra_args: Iterable[str] = (), console_input: st
 # pylint: disable-next=too-many-arguments,too-many-positional-arguments
 def sh_exit_if_exec_err(err_code: int, command_line: str,
                         extra_args: Iterable[str] = (), output_lines: list[str] | None = None, exit_on_err: bool = True,
-                        exit_msg: str = "", app_obj: ConsoleApp | None = None, shell: bool = False,
-                        env_vars: dict[str, str] | None = None, err_redirect: int | None = subprocess.DEVNULL) -> int:
+                        exit_msg: str = "", app_obj: ConsoleApp | UnsetType | None = None, shell: bool = False,
+                        env_vars: dict[str, str] | UnsetType | None = UNSET,
+                        err_redirect: int | None = subprocess.DEVNULL,
+                        decoder_splitter: Callable[[bytes], list[str]] = output_line_split) -> int:
     """ execute command in the current working directory, optionally capturing console output and exit app on error.
 
     :param err_code:            error code to pass to the console as exit code if the command set an error code and
@@ -242,13 +286,15 @@ def sh_exit_if_exec_err(err_code: int, command_line: str,
     :param exit_msg:            additional text to print on stdout/console if the app debug level is greater or equal
                                 to 1 (:data:`~ae.core.DEBUG_LEVEL_ENABLED`) or if an error occurred.
     :param app_obj:             :class:`~ae.console.ConsoleApp` instance, used for logging/force-ignorable error.
-    :param shell:               pass True to execute command in the default OS shell (see :meth:`subprocess.run`).
+    :param shell:               pass True to execute command in the default OS shell (see :func:`sh_exec`).
     :param env_vars:            OS shell environment variables to be used instead of the console/bash defaults.
     :param err_redirect:        control how the output on stderr gets captured, redirected and returned. see also
                                 :paramref:`sh_exec.err_redirect` for more details to the supported argument values.
                                 if this argument is not specified or has the value :data:`subprocess.DEVNULL` then the
                                 stderr output will get suppressed on the console and will also not get added to the
                                 list argument in :paramref:`.output_lines`.
+    :param decoder_splitter:    callable to decode and split the output from the stdout/stderr streams into a list
+                                of string chunks/lines, to be added to and returned by :paramref:`.output_lines`.
     :return:                    0 on success, or if an error occurred the error number set by the executed command.
     """
     if output_lines is None:
@@ -256,12 +302,13 @@ def sh_exit_if_exec_err(err_code: int, command_line: str,
         output_len = 0
     else:
         output_len = len(output_lines)
-    app_obj = app_obj or cast(ConsoleApp, main_app_instance())  # calls app_obj./ConsoleApp.chk() method
+    if app_obj is None:
+        app_obj = cast(ConsoleApp, main_app_instance())  # calls app_obj./ConsoleApp.chk() method
 
     sh_err = sh_exec(command_line, extra_args=extra_args, output_lines=output_lines, app_obj=app_obj, shell=shell,
-                     env_vars=env_vars, err_redirect=err_redirect)
+                     env_vars=env_vars, err_redirect=err_redirect, decoder_splitter=decoder_splitter)
 
-    if app_obj and (app_obj.debug or sh_err and exit_on_err):
+    if isinstance(app_obj, ConsoleApp) and (app_obj.debug or sh_err and exit_on_err):
         for line in output_lines[output_len:]:
             if app_obj.verbose or not line.startswith("LOG:  "):  # if verbose show mypy's endless (stderr) log entries
                 app_obj.po(" " * 6 + line)

{ae_shell-0.3.16 → ae_shell-0.3.17/ae_shell.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ae_shell
-Version: 0.3.16
+Version: 0.3.17
 Summary: ae namespace module portion shell: shell execution and environment helpers
 Home-page: https://gitlab.com/ae-group/ae_shell
 Author: AndiEcker
@@ -64,13 +64,13 @@ Dynamic: summary
 
 <!-- THIS FILE IS EXCLUSIVELY MAINTAINED by the project ae.ae v0.3.110 -->
 <!-- THIS FILE IS EXCLUSIVELY MAINTAINED by the project aedev.namespace_root_tpls v0.3.33 -->
-# shell 0.3.16
+# shell 0.3.17
 
 [![GitLab develop](https://img.shields.io/gitlab/pipeline/ae-group/ae_shell/develop?logo=python)](
     https://gitlab.com/ae-group/ae_shell)
 [![LatestPyPIrelease](
-    https://img.shields.io/gitlab/pipeline/ae-group/ae_shell/release0.3.16?logo=python)](
-    https://gitlab.com/ae-group/ae_shell/-/tree/release0.3.16)
+    https://img.shields.io/gitlab/pipeline/ae-group/ae_shell/release0.3.17?logo=python)](
+    https://gitlab.com/ae-group/ae_shell/-/tree/release0.3.17)
 [![PyPIVersions](https://img.shields.io/pypi/v/ae_shell)](
     https://pypi.org/project/ae-shell/#history)
 

{ae_shell-0.3.16 → ae_shell-0.3.17}/setup.py

@@ -77,7 +77,7 @@ setup_kwargs: dict[str, Any] = {
     },
     'python_requires': '>=3.12',
     'url': 'https://gitlab.com/ae-group/ae_shell',
-    'version': '0.3.16',
+    'version': '0.3.17',
     'zip_safe': True,
 }
 

{ae_shell-0.3.16 → ae_shell-0.3.17}/tests/test_shell.py

@@ -6,14 +6,15 @@ import subprocess
 from unittest.mock import PropertyMock, patch
 
 from ae.base import UNSET, camel_to_snake, norm_name, os_path_join, write_file
-from ae.system import load_env_var_defaults, active_venv
+from ae.system import load_env_var_defaults, os_env_venv
 from ae.core import DEBUG_LEVEL_DISABLED, DEBUG_LEVEL_ENABLED, DEBUG_LEVEL_VERBOSE
 from ae.console import MAIN_SECTION_NAME, ConsoleApp
 
 
 from ae.shell import (
     STDERR_BEG_MARKER, STDERR_END_MARKER,
-    debug_or_verbose, get_domain_user_var, hint, in_os_env, mask_token, sh_exec, sh_exit_if_exec_err)
+    debug_or_verbose, get_domain_user_var, hint, in_os_env, mask_token,
+    output_line_split, output_zero_split, sh_exec, sh_exit_if_exec_err)
 
 
 class TestHelpers:
@@ -257,6 +258,30 @@ STDERR_LINE = b'std___err'
 
 
 class TestShellExecutions:
+    def test_output_line_split(self):
+        assert output_line_split(STDOUT_LINE) == [STDOUT_LINE.decode()]
+
+        assert output_line_split(STDOUT_LINE + b"\n" + STDERR_LINE + b"\n") == [STDOUT_LINE.decode(),
+                                                                                STDERR_LINE.decode()]
+
+        assert output_line_split(STDOUT_LINE + b"\n\0" + STDERR_LINE + b"\0") == [
+            STDOUT_LINE.decode(), "\0" + STDERR_LINE.decode() + "\0"]
+
+        assert output_line_split(STDOUT_LINE + b"\r" + STDERR_LINE + b"\r\n\r\0\r") == [
+            STDOUT_LINE.decode(), STDERR_LINE.decode(), "\0"]
+
+    def test_output_zero_split(self):
+        assert output_zero_split(STDOUT_LINE) == [STDOUT_LINE.decode()]
+
+        assert output_zero_split(STDOUT_LINE + b"\0" + STDERR_LINE + b"\0") == [STDOUT_LINE.decode(),
+                                                                                STDERR_LINE.decode()]
+
+        assert output_zero_split(STDOUT_LINE + b"\0" + STDERR_LINE + b" = multi\nval\rlines\r\n" + STDERR_LINE) == [
+            STDOUT_LINE.decode(), STDERR_LINE.decode() + " = multi\nval\rlines\r\n" + STDERR_LINE.decode()]
+
+        assert output_zero_split(STDOUT_LINE + b"\n" + STDERR_LINE + b"\r\n\r\0\r") == [
+            STDOUT_LINE.decode() + "\n" + STDERR_LINE.decode() + "\r\n\r"]
+
     def test_sh_exec_catch_any_exception(self, capsys):
         with patch("subprocess.run", side_effect=Exception('broad tst exception')):
             assert sh_exec('any_cmd') == (126, )[0]
@@ -283,7 +308,7 @@ class TestShellExecutions:
         out, err = capsys.readouterr()
         assert "    . executing ['any', 'command']" in out
         assert os.getcwd() in out
-        assert active_venv() in out
+        assert os_env_venv() in out
         assert "****  subprocess.run(['any', 'command']) raised exception" in out
         assert err == ""
 
@@ -329,40 +354,41 @@ class TestShellExecutions:
     def test_sh_exec_run_args(self, mock_method):
         cmd_line = "cmd arg1 arg2"
         extra_args = ['extra_arg1', 'extra_arg2']
+        env = os.environ.copy()
 
         sh_exec(cmd_line, tuple(extra_args))
 
         mock_method.assert_called_with(
-            shlex.split(cmd_line) + extra_args, stdout=None, stderr=None, input=b'', check=True, shell=False, env=None)
+            shlex.split(cmd_line) + extra_args, stdout=None, stderr=None, input=b'', check=True, shell=False, env=env)
 
         sh_exec(cmd_line, shell=True)
 
         mock_method.assert_called_with(
-            cmd_line, stdout=None, stderr=None, input=b'', check=True, shell=True, env=None)
+            cmd_line, stdout=None, stderr=None, input=b'', check=True, shell=True, env=env)
 
         sh_exec(cmd_line, {_: "any" for _ in extra_args}, shell=True, err_redirect=subprocess.DEVNULL)
 
         mock_method.assert_called_with(
             cmd_line + " " + " ".join(extra_args), stdout=None, stderr=subprocess.DEVNULL, input=b'', check=True,
-            shell=True, env=None)
+            shell=True, env=env)
 
         sh_exec(cmd_line, extra_args, console_input='con_inp')
 
         mock_method.assert_called_with(
             shlex.split(cmd_line) + extra_args, stdout=None, stderr=None, input=b'con_inp',
-            check=True, shell=False, env=None)
+            check=True, shell=False, env=env)
 
         sh_exec(cmd_line, extra_args, output_lines=[])
 
         mock_method.assert_called_with(
             shlex.split(cmd_line) + extra_args, stdout=subprocess.PIPE, stderr=None, input=b'',
-            check=True, shell=False, env=None)
+            check=True, shell=False, env=env)
 
         sh_exec(cmd_line, extra_args, console_input='con_inp', output_lines=[], err_redirect=subprocess.STDOUT)
 
         mock_method.assert_called_with(
             shlex.split(cmd_line) + extra_args, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, input=b'con_inp',
-            check=True, shell=False, env=None)
+            check=True, shell=False, env=env)
 
         env_vars = {'A': "1", 'C': "tst_string value"}
 
@@ -372,6 +398,12 @@ class TestShellExecutions:
             shlex.split(cmd_line) + extra_args, stdout=None, stderr=None, input=b'',
             check=True, shell=False, env=env_vars)
 
+        sh_exec(cmd_line, extra_args, env_vars=None)
+
+        mock_method.assert_called_with(
+            shlex.split(cmd_line) + extra_args, stdout=None, stderr=None, input=b'',
+            check=True, shell=False, env=None)
+
     def test_sh_exec_run_returned_values(self):
         def _run_return(*_args, **_kwargs):
             """ mock to simulate subprocess.run return object. """
@@ -505,7 +537,7 @@ class TestShellExecutions:
         assert ret == (126, )[0]
         assert output == ['old output']
         out, err = capsys.readouterr()
-        assert f". executing [] at os.getcwd()='{os.getcwd()}' in active_venv()='{active_venv()}'" in out
+        assert f". executing [] at os.getcwd()='{os.getcwd()}' in os_env_venv()='{os_env_venv()}'" in out
         assert 'tst exit message' in out
         assert err == ""