Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Backport rev. 3ae74b361f53 to 2.7 branch.

This commit is contained in:
Georg Brandl 2013-03-28 13:35:18 +01:00
parent 75207abff9 44ea77bd81
commit 75da35747e
20 changed files with 59 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Doc/c-api/unicode.rst
View File

@ -252,6 +252,8 @@ APIs:
.. % because not all compilers support the %z width modifier -- we fake it
.. % when necessary via interpolating PY_FORMAT_SIZE_T.
.. tabularcolumns:: |l|l|L|
+-------------------+---------------------+--------------------------------+
| Format Characters | Type | Comment |
+===================+=====================+================================+

8
Doc/distutils/apiref.rst
View File

@ -26,6 +26,8 @@ setup script). Indirectly provides the :class:`distutils.dist.Distribution` and
The setup function takes a large number of arguments. These are laid out in the
following table.
.. tabularcolumns:: |l|L|L|
+--------------------+--------------------------------+-------------------------------------------------------------+
| argument name | value | type |
+====================+================================+=============================================================+
@ -125,6 +127,8 @@ setup script). Indirectly provides the :class:`distutils.dist.Distribution` and
*stop_after* tells :func:`setup` when to stop processing; possible values:
.. tabularcolumns:: |l|L|
+---------------+---------------------------------------------+
| value | description |
+===============+=============================================+
@ -165,6 +169,8 @@ the full reference.
The Extension class describes a single C or C++extension module in a setup
script. It accepts the following keyword arguments in its constructor
.. tabularcolumns:: |l|L|l|
+------------------------+--------------------------------+---------------------------+
| argument name | value | type |
+========================+================================+===========================+
@ -1556,6 +1562,8 @@ lines, and joining lines with backslashes.
The options are all boolean, and affect the values returned by :meth:`readline`
.. tabularcolumns:: |l|L|l|
+------------------+--------------------------------+---------+
| option name | description | default |
+==================+================================+=========+

4
Doc/faq/extending.rst
View File

@ -2,7 +2,9 @@
Extending/Embedding FAQ
=======================
.. contents::
.. only:: html
.. contents::
.. highlight:: c

5
Doc/faq/general.rst
View File

@ -4,7 +4,10 @@
General Python FAQ
==================
.. contents::
.. only:: html
.. contents::
General Information
===================

4
Doc/faq/gui.rst
View File

@ -4,7 +4,9 @@
Graphic User Interface FAQ
==========================
.. contents::
.. only:: html
.. contents::
What platform-independent GUI toolkits exist for Python?
========================================================

4
Doc/faq/library.rst
View File

@ -4,7 +4,9 @@
Library and Extension FAQ
=========================
.. contents::
.. only:: html
.. contents::
General Library Questions
=========================

4
Doc/faq/programming.rst
View File

@ -4,7 +4,9 @@
Programming FAQ
===============
.. contents::
.. only:: html
.. contents::
General Questions
=================

4
Doc/faq/windows.rst
View File

@ -6,7 +6,9 @@
Python on Windows FAQ
=====================
.. contents::
.. only:: html
.. contents::
How do I run a Python program under Windows?
--------------------------------------------

2
Doc/howto/logging.rst
View File

@ -63,6 +63,8 @@ The logging functions are named after the level or severity of the events
they are used to track. The standard levels and their applicability are
described below (in increasing order of severity):
.. tabularcolumns:: |l|L|
+--------------+---------------------------------------------+
| Level | When it's used |
+==============+=============================================+

2
Doc/install/index.rst
View File

@ -235,6 +235,8 @@ by how you built/installed Python itself. On Unix (and Mac OS X, which is also
Unix-based), it also depends on whether the module distribution being installed
is pure Python or contains extensions ("non-pure"):
.. tabularcolumns:: |l|l|l|l|
+-----------------+-----------------------------------------------------+--------------------------------------------------+-------+
| Platform | Standard installation location | Default value | Notes |
+=================+=====================================================+==================================================+=======+

6
Doc/library/codecs.rst
View File

@ -320,6 +320,8 @@ To simplify and standardize error handling, the :meth:`encode` and
providing the *errors* string argument. The following string values are defined
and implemented by all standard Python codecs:
.. tabularcolumns:: |l|L|
+-------------------------+-----------------------------------------------+
| Value | Meaning |
+=========================+===============================================+
@ -887,6 +889,8 @@ particular, the following variants typically exist:
* an IBM PC code page, which is ASCII compatible
.. tabularcolumns:: |l|p{0.3\linewidth}|p{0.3\linewidth}|
+-----------------+--------------------------------+--------------------------------+
| Codec | Aliases | Languages |
+=================+================================+================================+
@ -1103,6 +1107,8 @@ For the codecs listed below, the result in the "encoding" direction is always a
byte string. The result of the "decoding" direction is listed as operand type in
the table.
.. tabularcolumns:: |l|p{0.3\linewidth}|l|p{0.3\linewidth}|
+--------------------+---------------------------+----------------+---------------------------+
| Codec | Aliases | Operand type | Purpose |
+====================+===========================+================+===========================+

2
Doc/library/locale.rst
View File

@ -59,6 +59,8 @@ The :mod:`locale` module defines the following exception and functions:
Returns the database of the local conventions as a dictionary. This dictionary
has the following strings as keys:
.. tabularcolumns:: |l|l|L|
+----------------------+-------------------------------------+--------------------------------+
| Category | Key | Meaning |
+======================+=====================================+================================+

2
Doc/library/logging.rst
View File

@ -893,6 +893,8 @@ functions.
The following keyword arguments are supported.
.. tabularcolumns:: |l|L|
+--------------+---------------------------------------------+
| Format | Description |
+==============+=============================================+

2
Doc/library/subprocess.rst
View File

@ -145,6 +145,8 @@ use cases, the underlying :class:`Popen` interface can be used directly.
.. versionadded:: 2.7
..
.. warning::
Invoking the system shell with ``shell=True`` can be a security hazard

4
Doc/library/sys.rst
View File

@ -302,6 +302,8 @@ always available.
5.2.4.2.2 of the 1999 ISO/IEC C standard [C99]_, 'Characteristics of
floating types', for details.
.. tabularcolumns:: |l|l|L|
+---------------------+----------------+--------------------------------------------------+
| attribute | float.h macro | explanation |
+=====================+================+==================================================+
@ -599,6 +601,8 @@ always available.
A struct sequence that holds information about Python's
internal representation of integers. The attributes are read only.
.. tabularcolumns:: |l|L|
+-------------------------+----------------------------------------------+
| Attribute | Explanation |
+=========================+==============================================+

4
Doc/library/turtle.rst
View File

@ -2173,9 +2173,11 @@ It contains:
The demoscripts are:
.. tabularcolumns:: |l|L|L|
+----------------+------------------------------+-----------------------+
| Name | Description | Features |
+----------------+------------------------------+-----------------------+
+================+==============================+=======================+
| bytedesign | complex classical | :func:`tracer`, delay,|
| | turtlegraphics pattern | :func:`update` |
+----------------+------------------------------+-----------------------+

2
Doc/library/warnings.rst
View File

@ -57,6 +57,8 @@ There are a number of built-in exceptions that represent warning categories.
This categorization is useful to be able to filter out groups of warnings. The
following warnings category classes are currently defined:
.. tabularcolumns:: |l|p{0.6\linewidth}|
+----------------------------------+-----------------------------------------------+
| Class | Description |
+==================================+===============================================+

2
Doc/library/xml.etree.elementtree.rst
View File

@ -312,6 +312,8 @@ module. We'll be using the ``countrydata`` XML document from the
Supported XPath syntax
^^^^^^^^^^^^^^^^^^^^^^
.. tabularcolumns:: |l|L|
+-----------------------+------------------------------------------------------+
| Syntax | Meaning |
+=======================+======================================================+

2
Doc/reference/datamodel.rst
View File

@ -481,6 +481,8 @@ Callable types
Special attributes:
.. tabularcolumns:: |l|L|l|
+-----------------------+-------------------------------+-----------+
| Attribute | Meaning | |
+=======================+===============================+===========+

2
Doc/reference/expressions.rst
View File

@ -1370,7 +1370,7 @@ groups from right to left).
| :keyword:`not` ``x`` | Boolean NOT |
+-----------------------------------------------+-------------------------------------+
| :keyword:`in`, :keyword:`not in`, | Comparisons, including membership |
| :keyword:`is`, :keyword:`is not`, ``<``, | tests and identity tests, |
| :keyword:`is`, :keyword:`is not`, ``<``, | tests and identity tests |
| ``<=``, ``>``, ``>=``, ``<>``, ``!=``, ``==`` | |
+-----------------------------------------------+-------------------------------------+
| ``|`` | Bitwise OR |