Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
8aa7e999
Commit
8aa7e999
authored
Dec 28, 2010
by
Georg Brandl
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add sys.flags.quiet attribute for the new -q option, as noted missing by Eric in #1772833.
parent
31e3b77f
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
14 additions
and
4 deletions
+14
-4
Doc/library/sys.rst
Doc/library/sys.rst
+5
-0
Include/pydebug.h
Include/pydebug.h
+1
-0
Misc/NEWS
Misc/NEWS
+2
-0
Modules/main.c
Modules/main.c
+2
-3
Python/pythonrun.c
Python/pythonrun.c
+1
-0
Python/sysmodule.c
Python/sysmodule.c
+3
-1
No files found.
Doc/library/sys.rst
View file @
8aa7e999
...
...
@@ -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
...
...
Include/pydebug.h
View file @
8aa7e999
...
...
@@ -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
;
...
...
Misc/NEWS
View file @
8aa7e999
...
...
@@ -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
-------
...
...
Modules/main.c
View file @
8aa7e999
...
...
@@ -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
"
,
...
...
Python/pythonrun.c
View file @
8aa7e999
...
...
@@ -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' */
...
...
Python/sysmodule.c
View file @
8aa7e999
...
...
@@ -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
())
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment