[Python-checkins] r77876 - in python/branches/release26-maint: Misc/NEWS Misc/python.man
matthias.klose
python-checkins at python.org
Sun Jan 31 17:09:16 CET 2010
Author: matthias.klose
Date: Sun Jan 31 17:09:16 2010
New Revision: 77876
Log:
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).
........
Modified:
python/branches/release26-maint/ (props changed)
python/branches/release26-maint/Misc/NEWS
python/branches/release26-maint/Misc/python.man
Modified: python/branches/release26-maint/Misc/NEWS
==============================================================================
--- python/branches/release26-maint/Misc/NEWS (original)
+++ python/branches/release26-maint/Misc/NEWS Sun Jan 31 17:09:16 2010
@@ -213,6 +213,11 @@
- Issue #7541: when using ``python-config`` with a framework install the compiler might
use the wrong library.
+Documentation
+-------------
+
+- Update python manual page (options -B, -O0, -s, environment variables
+ PYTHONDONTWRITEBYTECODE, PYTHONNOUSERSITE).
Tests
-----
Modified: python/branches/release26-maint/Misc/python.man
==============================================================================
--- python/branches/release26-maint/Misc/python.man (original)
+++ python/branches/release26-maint/Misc/python.man Sun Jan 31 17:09:16 2010
@@ -8,6 +8,9 @@
.SH SYNOPSIS
.B python
[
+.B \-B
+]
+[
.B \-d
]
[
@@ -23,15 +26,21 @@
.B \-m
.I module-name
]
-[
-.B \-O
-]
.br
[
+.B \-O
+]
+[
+.B \-O0
+]
+[
.B -Q
.I argument
]
[
+.B \-s
+]
+[
.B \-S
]
[
@@ -57,6 +66,9 @@
[
.B \-3
]
+[
+.B \-?
+]
.br
[
.B \-c
@@ -95,6 +107,11 @@
program.
.SH COMMAND LINE OPTIONS
.TP
+.B \-B
+Don't write
+.I .py[co]
+files on import. See also PYTHONDONTWRITEBYTECODE.
+.TP
.BI "\-c " command
Specify the command to execute (see next section).
This terminates the option list (following options are passed as
@@ -108,7 +125,7 @@
Ignore environment variables like PYTHONPATH and PYTHONHOME that modify
the behavior of the interpreter.
.TP
-.B \-h
+.B \-h ", " \-? ", "\-\-help
Prints the usage for the interpreter executable and exits.
.TP
.B \-i
@@ -131,6 +148,9 @@
.I .pyc
to \fI.pyo\fP. Given twice, causes docstrings to be discarded.
.TP
+.B \-O0
+Discard docstrings in addition to the \fB-O\fP optimizations.
+.TP
.BI "\-Q " argument
Division control; see PEP 238. The argument must be one of "old" (the
default, int/int and long/long return an int or long), "new" (new
@@ -140,6 +160,9 @@
all use of the division operator). For a use of "warnall", see the
Tools/scripts/fixdiv.py script.
.TP
+.B \-s
+Don't add user site directory to sys.path.
+.TP
.B \-S
Disable the import of the module
.I site
@@ -167,7 +190,7 @@
searching for a module. Also provides information on module cleanup
at exit.
.TP
-.B \-V
+.B \-V ", " \-\-version
Prints the Python version number of the executable and exits.
.TP
.BI "\-W " argument
@@ -370,9 +393,17 @@
If this is set to a non-empty string it is equivalent to specifying
the \fB\-d\fP option. If set to an integer, it is equivalent to
specifying \fB\-d\fP multiple times.
+.IP PYTHONDONTWRITEBYTECODE
+If this is set to a non-empty string it is equivalent to specifying
+the \fB\-B\fP option (don't try to write
+.I .py[co]
+files).
.IP PYTHONINSPECT
If this is set to a non-empty string it is equivalent to specifying
the \fB\-i\fP option.
+.IP PYTHONNOUSERSITE
+If this is set to a non-empty string it is equivalent to specifying
+the \fB\-s\fP option (Don't add the user site directory to sys.path).
.IP PYTHONUNBUFFERED
If this is set to a non-empty string it is equivalent to specifying
the \fB\-u\fP option.
More information about the Python-checkins
mailing list