summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2010-10-13 22:25:26 (GMT)
committerBenjamin Peterson <benjamin@python.org>2010-10-13 22:25:26 (GMT)
commita5cb39f2ec84fdcc852773496333e397b7c61fbc (patch)
treef3cf2206733c5a075677c04330aea85c2f11eadd /Misc
parent8e73403284b1c2a1e38ec63986e30b7080058cdb (diff)
downloadcpython-a5cb39f2ec84fdcc852773496333e397b7c61fbc.zip
cpython-a5cb39f2ec84fdcc852773496333e397b7c61fbc.tar.gz
cpython-a5cb39f2ec84fdcc852773496333e397b7c61fbc.tar.bz2
Merged revisions 85436 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r85436 | benjamin.peterson | 2010-10-13 17:20:15 -0500 (Wed, 13 Oct 2010) | 1 line put PYTHONIOENCODING in man page ........
Diffstat (limited to 'Misc')
-rw-r--r--Misc/python.man13
1 files changed, 11 insertions, 2 deletions
diff --git a/Misc/python.man b/Misc/python.man
index 261a118..ddfccef 100644
--- a/Misc/python.man
+++ b/Misc/python.man
@@ -401,9 +401,18 @@ files).
.IP PYTHONINSPECT
If this is set to a non-empty string it is equivalent to specifying
the \fB\-i\fP option.
+.IP PYTHONIOENCODING
+If this is set before running the interpreter, it overrides the encoding used
+for stdin/stdout/stderr, in the syntax
+.IB encodingname ":" errorhandler
+The
+.IB errorhandler
+part is optional and has the same meaning as in str.encode. For stderr, the
+.IB errorhandler
+ part is ignored; the handler will always be \'backslashreplace\'.
.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).
+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.