mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-13 10:23:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Issue #10089: Add support for arbitrary -X options on the command-line.

Browse source 
They can be retrieved through a new attribute `sys._xoptions`.
This commit is contained in:
Antoine Pitrou 2010-10-21 13:42:28 +00:00
parent 6d61cb4d2f
commit 9583cac633
10 changed files with 136 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Python/getopt.c
View file

@ -89,12 +89,6 @@ int _PyOS_GetOpt(int argc, wchar_t **argv, wchar_t *optstring)
return '_';
}
if (option == 'X') {
fprintf(stderr,
"-X is reserved for implementation-specific arguments\n");
return '_';
}
if ((ptr = wcschr(optstring, option)) == NULL) {
if (_PyOS_opterr)
fprintf(stderr, "Unknown option: -%c\n", (char)option);

60
Python/sysmodule.c
View file

@ -1086,6 +1086,61 @@ PySys_HasWarnOptions(void)
return (warnoptions != NULL && (PyList_Size(warnoptions) > 0)) ? 1 : 0;
}
static PyObject *xoptions = NULL;
static PyObject *
get_xoptions(void)
{
if (xoptions == NULL || !PyDict_Check(xoptions)) {
Py_XDECREF(xoptions);
xoptions = PyDict_New();
}
return xoptions;
}
void
PySys_AddXOption(const wchar_t *s)
{
PyObject *opts;
PyObject *name = NULL, *value = NULL;
const wchar_t *name_end;
int r;
opts = get_xoptions();
if (opts == NULL)
goto error;
name_end = wcschr(s, L'=');
if (!name_end) {
name = PyUnicode_FromWideChar(s, -1);
value = Py_True;
Py_INCREF(value);
}
else {
name = PyUnicode_FromWideChar(s, name_end - s);
value = PyUnicode_FromWideChar(name_end + 1, -1);
}
if (name == NULL || value == NULL)
goto error;
r = PyDict_SetItem(opts, name, value);
Py_DECREF(name);
Py_DECREF(value);
return;
error:
Py_XDECREF(name);
Py_XDECREF(value);
/* No return value, therefore clear error state if possible */
if (_Py_atomic_load_relaxed(&_PyThreadState_Current))
PyErr_Clear();
}
PyObject *
PySys_GetXOptions(void)
{
return get_xoptions();
}
/* XXX This doc string is too long to be a single string literal in VC++ 5.0.
Two literals concatenated works just fine. If you have a K&R compiler
or other abomination that however *does* understand longer strings,
@ -1535,6 +1590,11 @@ _PySys_Init(void)
PyDict_SetItemString(sysdict, "warnoptions", warnoptions);
}
v = get_xoptions();
if (v != NULL) {
PyDict_SetItemString(sysdict, "_xoptions", v);
}
/* version_info */
if (VersionInfoType.tp_name == 0)
PyStructSequence_InitType(&VersionInfoType, &version_info_desc);