Skip to content

[3.7] bpo-32573: sys.argv always exists and is non-empty #13553

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

Closed
vstinner wants to merge 1 commit into from
Closed

[3.7] bpo-32573: sys.argv always exists and is non-empty #13553

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
2 changes: 1 addition & 1 deletion Lib/test/test_embed.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ class InitConfigTests(EmbeddingTestsMixin, unittest.TestCase):
'coerce_c_locale_warn': 0,

'program_name': './_testembed',
'argv': [],
'argv': [''],
'program': None,

'xoptions': [],
Expand Down
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Core and Builtins/2019-05-24-18-23-15.bpo-32573.LSe-jY.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Ensure that :data:`sys.argv` always exists and is non-empty. When Python is
embedded in an application and ``argv`` is not set, use ``['']``.
15 changes: 11 additions & 4 deletions Modules/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2373,6 +2373,17 @@ _PyCoreConfig_Read(_PyCoreConfig *config)
}
}

/* ensure that sys.argv is always set and non-empty */
if (config->argc < 0) {
config->argc = 0;
}
if (config->argc == 0) {
err = wstrlist_append(&config->argc, &config->argv, L"");
if (_Py_INIT_FAILED(err)) {
return err;
}
}

/* default values */
if (config->dev_mode) {
if (config->faulthandler < 0) {
Expand Down Expand Up @@ -2401,10 +2412,6 @@ _PyCoreConfig_Read(_PyCoreConfig *config)
if (config->utf8_mode < 0) {
config->utf8_mode = 0;
}
if (config->argc < 0) {
config->argc = 0;
}

return _Py_INIT_OK();
}

Expand Down