mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-04 03:44:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

merge with 3.2

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

2
Doc/library/subprocess.rst
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 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 :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 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`. to :func:`open`.
If *shell* is :const:`True`, the specified command will be executed through If *shell* is :const:`True`, the specified command will be executed through

5
Doc/library/sys.rst
View file

@ -195,7 +195,7 @@ always available.
be set at build time with the ``--exec-prefix`` argument to the be set at build time with the ``--exec-prefix`` argument to the
:program:`configure` script. Specifically, all configuration files (e.g. the :program:`configure` script. Specifically, all configuration files (e.g. the
:file:`pyconfig.h` header file) are installed in the directory :file:`pyconfig.h` header file) are installed in the directory
:file:`{exec_prefix}/lib/python{X.Y}/config', and shared library modules are :file:`{exec_prefix}/lib/python{X.Y}/config`, and shared library modules are
installed in :file:`{exec_prefix}/lib/python{X.Y}/lib-dynload`, where *X.Y* installed in :file:`{exec_prefix}/lib/python{X.Y}/lib-dynload`, where *X.Y*
is the version number of Python, for example ``3.2``. is the version number of Python, for example ``3.2``.
@ -756,6 +756,7 @@ always available.
always use the ``startswith`` idiom presented above. always use the ``startswith`` idiom presented above.
.. seealso:: .. seealso::
:attr:`os.name` has a coarser granularity. :func:`os.uname` gives :attr:`os.name` has a coarser granularity. :func:`os.uname` gives
system-dependent version information. system-dependent version information.
@ -771,7 +772,7 @@ always available.
argument to the :program:`configure` script. The main collection of Python argument to the :program:`configure` script. The main collection of Python
library modules is installed in the directory :file:`{prefix}/lib/python{X.Y}`` library modules is installed in the directory :file:`{prefix}/lib/python{X.Y}``
while the platform independent header files (all except :file:`pyconfig.h`) are while the platform independent header files (all except :file:`pyconfig.h`) are
stored in :file:`{prefix}/include/python{X.Y}``, where *X.Y* is the version stored in :file:`{prefix}/include/python{X.Y}`, where *X.Y* is the version
number of Python, for example ``3.2``. number of Python, for example ``3.2``.