summaryrefslogtreecommitdiff
path: root/Python
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2010-12-28 18:30:18 +0000
committerGeorg Brandl <georg@python.org>2010-12-28 18:30:18 +0000
commit37eff4f6fb0628592d5d39b6cec49ccd8ce4a333 (patch)
tree10018b3eccd4f65f60a14581c92b33fdf867b9a4 /Python
parent38bc20f7be91f3caa5ac08f8d0f5709f89294383 (diff)
downloadcpython-37eff4f6fb0628592d5d39b6cec49ccd8ce4a333.tar.gz
Add sys.flags.quiet attribute for the new -q option, as noted missing by Eric in #1772833.
Diffstat (limited to 'Python')
-rw-r--r--Python/pythonrun.c1
-rw-r--r--Python/sysmodule.c4
2 files changed, 4 insertions, 1 deletions
diff --git a/Python/pythonrun.c b/Python/pythonrun.c
index f7335a2b21..e3836b8b7c 100644
--- a/Python/pythonrun.c
+++ b/Python/pythonrun.c
@@ -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' */
diff --git a/Python/sysmodule.c b/Python/sysmodule.c
index 0a14f0eb36..730567eaf7 100644
--- a/Python/sysmodule.c
+++ b/Python/sysmodule.c
@@ -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()) {