merge with 3.2

This commit is contained in:
Georg Brandl 2012-02-23 21:17:27 +01:00
commit 335d628a66
2 changed files with 4 additions and 3 deletions

View file

@ -240,7 +240,7 @@ default values. The arguments that are most commonly needed are:
When *stdout* or *stderr* are pipes and *universal_newlines* is
:const:`True` then the output data is assumed to be encoded as UTF-8 and
will automatically be decoded to text. All line endings will be converted
to ``'\n'`` as described for the universal newlines `'U'`` mode argument
to ``'\n'`` as described for the universal newlines ``'U'`` mode argument
to :func:`open`.
If *shell* is :const:`True`, the specified command will be executed through