Add sys.flags.quiet attribute for the new -q option, as noted missing by Eric in #1772833.
This commit is contained in:
parent
31e3b77fea
commit
8aa7e999b5
|
@ -264,6 +264,11 @@ always available.
|
|||
+------------------------------+------------------------------------------+
|
||||
| :const:`bytes_warning` | -b |
|
||||
+------------------------------+------------------------------------------+
|
||||
| :const:`quiet` | -q |
|
||||
+------------------------------+------------------------------------------+
|
||||
|
||||
.. versionchanged:: 3.2
|
||||
Added ``quiet`` attribute for the new :option:`-q` flag.
|
||||
|
||||
|
||||
.. data:: float_info
|
||||
|
|
|
@ -7,6 +7,7 @@ extern "C" {
|
|||
|
||||
PyAPI_DATA(int) Py_DebugFlag;
|
||||
PyAPI_DATA(int) Py_VerboseFlag;
|
||||
PyAPI_DATA(int) Py_QuietFlag;
|
||||
PyAPI_DATA(int) Py_InteractiveFlag;
|
||||
PyAPI_DATA(int) Py_InspectFlag;
|
||||
PyAPI_DATA(int) Py_OptimizeFlag;
|
||||
|
|
|
@ -15,6 +15,8 @@ Core and Builtins
|
|||
- Issue #10779: PyErr_WarnExplicit() decodes the filename from the filesystem
|
||||
encoding instead of UTF-8.
|
||||
|
||||
- Add sys.flags attribute for the new -q command-line option.
|
||||
|
||||
Library
|
||||
-------
|
||||
|
||||
|
|
|
@ -319,7 +319,6 @@ Py_Main(int argc, wchar_t **argv)
|
|||
int stdin_is_interactive = 0;
|
||||
int help = 0;
|
||||
int version = 0;
|
||||
int quiet = 0;
|
||||
int saw_unbuffered_flag = 0;
|
||||
PyCompilerFlags cf;
|
||||
|
||||
|
@ -427,7 +426,7 @@ Py_Main(int argc, wchar_t **argv)
|
|||
break;
|
||||
|
||||
case 'q':
|
||||
quiet++;
|
||||
Py_QuietFlag++;
|
||||
break;
|
||||
|
||||
/* This space reserved for other options */
|
||||
|
@ -594,7 +593,7 @@ Py_Main(int argc, wchar_t **argv)
|
|||
#endif
|
||||
Py_Initialize();
|
||||
|
||||
if (!quiet && (Py_VerboseFlag ||
|
||||
if (!Py_QuietFlag && (Py_VerboseFlag ||
|
||||
(command == NULL && filename == NULL &&
|
||||
module == NULL && stdin_is_interactive))) {
|
||||
fprintf(stderr, "Python %s on %s\n",
|
||||
|
|
|
@ -78,6 +78,7 @@ extern void _PyGILState_Fini(void);
|
|||
|
||||
int Py_DebugFlag; /* Needed by parser.c */
|
||||
int Py_VerboseFlag; /* Needed by import.c */
|
||||
int Py_QuietFlag; /* Needed by sysmodule.c */
|
||||
int Py_InteractiveFlag; /* Needed by Py_FdIsInteractive() below */
|
||||
int Py_InspectFlag; /* Needed to determine whether to exit at SystemError */
|
||||
int Py_NoSiteFlag; /* Suppress 'import site' */
|
||||
|
|
|
@ -1417,7 +1417,8 @@ static PyStructSequence_Field flags_fields[] = {
|
|||
#endif
|
||||
/* {"unbuffered", "-u"}, */
|
||||
/* {"skip_first", "-x"}, */
|
||||
{"bytes_warning", "-b"},
|
||||
{"bytes_warning", "-b"},
|
||||
{"quiet", "-q"},
|
||||
{0}
|
||||
};
|
||||
|
||||
|
@ -1461,6 +1462,7 @@ make_flags(void)
|
|||
/* SetFlag(saw_unbuffered_flag); */
|
||||
/* SetFlag(skipfirstline); */
|
||||
SetFlag(Py_BytesWarningFlag);
|
||||
SetFlag(Py_QuietFlag);
|
||||
#undef SetFlag
|
||||
|
||||
if (PyErr_Occurred()) {
|
||||
|
|
Loading…
Reference in New Issue