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.
........
This commit is contained in:
Georg Brandl 2008-06-11 18:03:09 +00:00
parent 3b4e479d88
commit 2c906f1540

View file

@ -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