mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-02 16:13:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merge fixes for #12256 and typos from 3.2

Browse source
This commit is contained in:
Éric Araujo 2011-08-19 09:36:59 +02:00
commit d1ca4f9dc6
3 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Doc/distutils/install.rst
View file

@ -101,7 +101,7 @@ one command from a terminal::
python setup.py install python setup.py install
For Windows, this command should be run from a command prompt windows For Windows, this command should be run from a command prompt window
(:menuselection:`Start --> Accessories`):: (:menuselection:`Start --> Accessories`)::
setup.py install setup.py install

2
Doc/distutils/setupscript.rst
View file

@ -254,7 +254,7 @@ code: it's probably better to write C code like ::
If you need to include header files from some other Python extension, you can If you need to include header files from some other Python extension, you can
take advantage of the fact that header files are installed in a consistent way take advantage of the fact that header files are installed in a consistent way
by the Distutils :command:`install_header` command. For example, the Numerical by the Distutils :command:`install_headers` command. For example, the Numerical
Python header files are installed (on a standard Unix installation) to Python header files are installed (on a standard Unix installation) to
:file:`/usr/local/include/python1.5/Numerical`. (The exact location will differ :file:`/usr/local/include/python1.5/Numerical`. (The exact location will differ
according to your platform and Python installation.) Since the Python include according to your platform and Python installation.) Since the Python include

5
Doc/glossary.rst
View file

@ -30,7 +30,10 @@ Glossary
Abstract base classes complement :term:`duck-typing` by Abstract base classes complement :term:`duck-typing` by
providing a way to define interfaces when other techniques like providing a way to define interfaces when other techniques like
:func:`hasattr` would be clumsy or subtly wrong (for example with :func:`hasattr` would be clumsy or subtly wrong (for example with
:ref:`magic methods <special-lookup>`). Python comes with many built-in ABCs for :ref:`magic methods <special-lookup>`). ABCs introduce virtual
subclasses, which are classes that don't inherit from a class but are
still recognized by :func:`isinstance` and :func:`issubclass`; see the
:mod:`abc` module documentation. Python comes with many built-in ABCs for
data structures (in the :mod:`collections.abc` module), numbers (in the data structures (in the :mod:`collections.abc` module), numbers (in the
:mod:`numbers` module), streams (in the :mod:`io` module), import finders :mod:`numbers` module), streams (in the :mod:`io` module), import finders
and loaders (in the :mod:`importlib.abc` module). You can create your own and loaders (in the :mod:`importlib.abc` module). You can create your own