summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorSenthil Kumaran <senthil@uthcode.com>2013-06-20 03:20:26 (GMT)
committerSenthil Kumaran <senthil@uthcode.com>2013-06-20 03:20:26 (GMT)
commitf83bc7a2c94769f1793da88e1f645477980580f1 (patch)
tree016cc5be59b6d529cd483564a6682d24f0456226 /Misc
parent2f72aed1b40d9f88361e07bd83b14edc7e305c39 (diff)
parentce3dd0bdd550500d149121ca08611ebca623641f (diff)
downloadcpython-f83bc7a2c94769f1793da88e1f645477980580f1.zip
cpython-f83bc7a2c94769f1793da88e1f645477980580f1.tar.gz
cpython-f83bc7a2c94769f1793da88e1f645477980580f1.tar.bz2
merge from 3.3
Add -b and -X options to python man page. Patch contributed by Corey Brune.
Diffstat (limited to 'Misc')
-rw-r--r--Misc/python.man22
1 files changed, 18 insertions, 4 deletions
diff --git a/Misc/python.man b/Misc/python.man
index 72e1ecb..8155e6a 100644
--- a/Misc/python.man
+++ b/Misc/python.man
@@ -11,6 +11,9 @@ python \- an interpreted, interactive, object-oriented programming language
.B \-B
]
[
+.B \-b
+]
+[
.B \-d
]
[
@@ -23,14 +26,14 @@ python \- an interpreted, interactive, object-oriented programming language
.B \-i
]
[
-.B \-m
+.B \-m
.I module-name
]
-[
-.B \-q
-]
.br
[
+.B \-q
+]
+[
.B \-O
]
[
@@ -60,6 +63,10 @@ python \- an interpreted, interactive, object-oriented programming language
.B \-x
]
[
+[
+.B \-X
+.I option
+]
.B \-?
]
.br
@@ -105,6 +112,10 @@ Don't write
.I .py[co]
files on import. See also PYTHONDONTWRITEBYTECODE.
.TP
+.B \-b
+Issue warnings about str(bytes_instance), str(bytearray_instance)
+and comparing bytes/bytearray with str. (-bb: issue errors)
+.TP
.BI "\-c " command
Specify the command to execute (see next section).
This terminates the option list (following options are passed as
@@ -243,6 +254,9 @@ case-sensitive. The
field matches the line number, where zero matches all line numbers and
is thus equivalent to an omitted line number.
.TP
+.BI "\-X " option
+Set implementation specific option.
+.TP
.B \-x
Skip the first line of the source. This is intended for a DOS
specific hack only. Warning: the line numbers in error messages will