merge with 3.2
This commit is contained in:
commit
335d628a66
|
@ -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
|
||||
|
|
|
@ -195,7 +195,7 @@ always available.
|
|||
be set at build time with the ``--exec-prefix`` argument to the
|
||||
:program:`configure` script. Specifically, all configuration files (e.g. the
|
||||
: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*
|
||||
is the version number of Python, for example ``3.2``.
|
||||
|
||||
|
@ -756,6 +756,7 @@ always available.
|
|||
always use the ``startswith`` idiom presented above.
|
||||
|
||||
.. seealso::
|
||||
|
||||
:attr:`os.name` has a coarser granularity. :func:`os.uname` gives
|
||||
system-dependent version information.
|
||||
|
||||
|
@ -771,7 +772,7 @@ always available.
|
|||
argument to the :program:`configure` script. The main collection of Python
|
||||
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
|
||||
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``.
|
||||
|
||||
|
||||
|
|
Loading…
Reference in New Issue