Skip to content
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

Jump to bottom

Custom subprocess environment variables for Python embedded #989

Merged
merged 2 commits into from
Sep 12, 2022
Merged

Custom subprocess environment variables for Python embedded #989

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d3ef360
Custom subprocess environment variables for Python embedded
lmbelo Jul 19, 2022
57c3727
Changed environment configuration name from subprocessEnv to pythonEnv
lmbelo Aug 28, 2022
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
9 changes: 8 additions & 1 deletion src/debugpy/server/api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
"qt": "none",
"subProcess": True,
"python": sys.executable,
"pythonEnv": {},
}

_config_valid_values = {
Expand Down Expand Up @@ -188,14 +189,20 @@ def listen(address, settrace_kwargs):
creationflags |= 0x08000000 # CREATE_NO_WINDOW
creationflags |= 0x00000200 # CREATE_NEW_PROCESS_GROUP

# On embedded applications, environment variables might not contain
# Python environment settings.
python_env = _config.get("pythonEnv")
if not bool(python_env):
python_env = None

# Adapter will outlive this process, so we shouldn't wait for it. However, we
# need to ensure that the Popen instance for it doesn't get garbage-collected
# by holding a reference to it in a non-local variable, to avoid triggering
# https://bugs.python.org/issue37380.
try:
global _adapter_process
_adapter_process = subprocess.Popen(
adapter_args, close_fds=True, creationflags=creationflags
adapter_args, close_fds=True, creationflags=creationflags, env=python_env
)
if os.name == "posix":
# It's going to fork again to daemonize, so we need to wait on it to
Expand Down