Skip to content

Commit d71657c

Browse files
committed
Merged revisions 77875 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r77875 | matthias.klose | 2010-01-31 17:05:13 +0100 (So, 31 Jan 2010) | 3 lines - Update python manual page (options -B, -O0, -s, environment variables PYTHONDONTWRITEBYTECODE, PYTHONNOUSERSITE). ........
1 parent e68892d commit d71657c

2 files changed

Lines changed: 41 additions & 5 deletions

File tree

‎Misc/NEWS‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,11 @@ Build
213213
- Issue #7541: when using ``python-config`` with a framework install the compiler might
214214
use the wrong library.
215215

216+
Documentation
217+
-------------
218+
219+
- Update python manual page (options -B, -O0, -s, environment variables
220+
PYTHONDONTWRITEBYTECODE, PYTHONNOUSERSITE).
216221

217222
Tests
218223
-----

‎Misc/python.man‎

Lines changed: 36 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ python \- an interpreted, interactive, object-oriented programming language
88
.SH SYNOPSIS
99
.B python
1010
[
11+
.B \-B
12+
]
13+
[
1114
.B \-d
1215
]
1316
[
@@ -23,15 +26,21 @@ python \- an interpreted, interactive, object-oriented programming language
2326
.B \-m
2427
.I module-name
2528
]
26-
[
27-
.B \-O
28-
]
2929
.br
3030
[
31+
.B \-O
32+
]
33+
[
34+
.B \-O0
35+
]
36+
[
3137
.B -Q
3238
.I argument
3339
]
3440
[
41+
.B \-s
42+
]
43+
[
3544
.B \-S
3645
]
3746
[
@@ -57,6 +66,9 @@ python \- an interpreted, interactive, object-oriented programming language
5766
[
5867
.B \-3
5968
]
69+
[
70+
.B \-?
71+
]
6072
.br
6173
[
6274
.B \-c
@@ -95,6 +107,11 @@ viewed by running the
95107
program.
96108
.SH COMMAND LINE OPTIONS
97109
.TP
110+
.B \-B
111+
Don't write
112+
.I .py[co]
113+
files on import. See also PYTHONDONTWRITEBYTECODE.
114+
.TP
98115
.BI "\-c " command
99116
Specify the command to execute (see next section).
100117
This terminates the option list (following options are passed as
@@ -108,7 +125,7 @@ compilation options).
108125
Ignore environment variables like PYTHONPATH and PYTHONHOME that modify
109126
the behavior of the interpreter.
110127
.TP
111-
.B \-h
128+
.B \-h ", " \-? ", "\-\-help
112129
Prints the usage for the interpreter executable and exits.
113130
.TP
114131
.B \-i
@@ -131,6 +148,9 @@ compiled (bytecode) files from
131148
.I .pyc
132149
to \fI.pyo\fP. Given twice, causes docstrings to be discarded.
133150
.TP
151+
.B \-O0
152+
Discard docstrings in addition to the \fB-O\fP optimizations.
153+
.TP
134154
.BI "\-Q " argument
135155
Division control; see PEP 238. The argument must be one of "old" (the
136156
default, int/int and long/long return an int or long), "new" (new
@@ -140,6 +160,9 @@ long/long), or "warnall" (old division semantics with a warning for
140160
all use of the division operator). For a use of "warnall", see the
141161
Tools/scripts/fixdiv.py script.
142162
.TP
163+
.B \-s
164+
Don't add user site directory to sys.path.
165+
.TP
143166
.B \-S
144167
Disable the import of the module
145168
.I site
@@ -167,7 +190,7 @@ twice, print a message for each file that is checked for when
167190
searching for a module. Also provides information on module cleanup
168191
at exit.
169192
.TP
170-
.B \-V
193+
.B \-V ", " \-\-version
171194
Prints the Python version number of the executable and exits.
172195
.TP
173196
.BI "\-W " argument
@@ -370,9 +393,17 @@ specifying \fB\-O\fP multiple times.
370393
If this is set to a non-empty string it is equivalent to specifying
371394
the \fB\-d\fP option. If set to an integer, it is equivalent to
372395
specifying \fB\-d\fP multiple times.
396+
.IP PYTHONDONTWRITEBYTECODE
397+
If this is set to a non-empty string it is equivalent to specifying
398+
the \fB\-B\fP option (don't try to write
399+
.I .py[co]
400+
files).
373401
.IP PYTHONINSPECT
374402
If this is set to a non-empty string it is equivalent to specifying
375403
the \fB\-i\fP option.
404+
.IP PYTHONNOUSERSITE
405+
If this is set to a non-empty string it is equivalent to specifying
406+
the \fB\-s\fP option (Don't add the user site directory to sys.path).
376407
.IP PYTHONUNBUFFERED
377408
If this is set to a non-empty string it is equivalent to specifying
378409
the \fB\-u\fP option.

0 commit comments

Comments
 (0)