diff options
| author | Georg Brandl <georg@python.org> | 2008-06-11 18:03:09 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2008-06-11 18:03:09 (GMT) |
| commit | 2c906f15409259f6ac7fe8772e67e6c26590322b (patch) | |
| tree | cdc83cd01c4745cf41a44232fc66efc11b62a153 /Doc/using | |
| parent | 3b4e479d887989b50c855f905e94ee71d7cb1a8f (diff) | |
| download | cpython-2c906f15409259f6ac7fe8772e67e6c26590322b.zip cpython-2c906f15409259f6ac7fe8772e67e6c26590322b.tar.gz cpython-2c906f15409259f6ac7fe8772e67e6c26590322b.tar.bz2 | |
Merged revisions 64130 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r64130 | georg.brandl | 2008-06-11 19:57:44 +0200 (Wed, 11 Jun 2008) | 2 lines
Clarify what ":errorhandler" refers to.
........
Diffstat (limited to 'Doc/using')
| -rw-r--r-- | Doc/using/cmdline.rst | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Doc/using/cmdline.rst b/Doc/using/cmdline.rst index 5100c21..0a45aa5 100644 --- a/Doc/using/cmdline.rst +++ b/Doc/using/cmdline.rst @@ -419,6 +419,13 @@ These environment variables influence Python's behavior. import of source modules. +.. envvar:: PYTHONIOENCODING + + Overrides the encoding used for stdin/stdout/stderr, in the syntax + ``encodingname:errorhandler``. The ``:errorhandler`` part is optional and + has the same meaning as in :func:`str.encode`. + + .. envvar:: PYTHONNOUSERSITE If this is set, Python won't add the user site directory to sys.path @@ -460,13 +467,6 @@ if Python was configured with the :option:`--with-pydebug` build option. If set, Python will dump objects and reference counts still alive after shutting down the interpreter. -.. envvar:: PYTHONIOENCODING - - Overrides the encoding used for stdin/stdout/stderr, in the syntax - encodingname:errorhandler, with the :errors part being optional. - - .. versionadded:: 2.6 - .. envvar:: PYTHONMALLOCSTATS |