[Python-checkins] cpython (merge 3.3 -> default): merge from 3.3

[senthil.kumaran]

http://hg.python.org/cpython/rev/e26b00adb7ba
changeset:   84225:e26b00adb7ba
parent:      84222:dcb4985d82bc
parent:      84224:dfead0696a71
user:        Senthil Kumaran <senthil at uthcode.com>
date:        Wed Jun 19 22:20:26 2013 -0500
summary:
  merge from 3.3

Add -b and -X options to python man page.
Patch contributed by Corey Brune.

files:
  Misc/python.man |  22 ++++++++++++++++++----
  1 files changed, 18 insertions(+), 4 deletions(-)


diff --git a/Misc/python.man b/Misc/python.man
--- a/Misc/python.man
+++ b/Misc/python.man
@@ -11,6 +11,9 @@
 .B \-B
 ]
 [
+.B \-b
+]
+[
 .B \-d
 ]
 [
@@ -23,14 +26,14 @@
 .B \-i
 ]
 [
-.B \-m 
+.B \-m
 .I module-name
 ]
-[
-.B \-q
-]
 .br
        [
+.B \-q
+]
+[
 .B \-O
 ]
 [
@@ -60,6 +63,10 @@
 .B \-x
 ]
 [
+[
+.B \-X
+.I option
+]
 .B \-?
 ]
 .br
@@ -105,6 +112,10 @@
 .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 @@
 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

-- 
Repository URL: http://hg.python.org/cpython