[Python-checkins] cpython (merge 3.3 -> 2.7): Backport rev. 3ae74b361f53 to 2.7 branch.
georg.brandl
python-checkins at python.org
Thu Mar 28 13:35:11 CET 2013
http://hg.python.org/cpython/rev/75512a165318
changeset: 82988:75512a165318
branch: 2.7
parent: 82985:5fddf795de2c
parent: 82986:3ae74b361f53
user: Georg Brandl <georg at python.org>
date: Thu Mar 28 13:35:18 2013 +0100
summary:
Backport rev. 3ae74b361f53 to 2.7 branch.
files:
Doc/c-api/unicode.rst | 2 ++
Doc/distutils/apiref.rst | 8 ++++++++
Doc/faq/extending.rst | 4 +++-
Doc/faq/general.rst | 5 ++++-
Doc/faq/gui.rst | 4 +++-
Doc/faq/library.rst | 4 +++-
Doc/faq/programming.rst | 4 +++-
Doc/faq/windows.rst | 4 +++-
Doc/howto/logging.rst | 2 ++
Doc/install/index.rst | 2 ++
Doc/library/codecs.rst | 6 ++++++
Doc/library/locale.rst | 2 ++
Doc/library/logging.rst | 2 ++
Doc/library/subprocess.rst | 2 ++
Doc/library/sys.rst | 4 ++++
Doc/library/turtle.rst | 4 +++-
Doc/library/warnings.rst | 2 ++
Doc/library/xml.etree.elementtree.rst | 2 ++
Doc/reference/datamodel.rst | 2 ++
Doc/reference/expressions.rst | 2 +-
20 files changed, 59 insertions(+), 8 deletions(-)
diff --git a/Doc/c-api/unicode.rst b/Doc/c-api/unicode.rst
--- a/Doc/c-api/unicode.rst
+++ b/Doc/c-api/unicode.rst
@@ -252,6 +252,8 @@
.. % 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 |
+===================+=====================+================================+
diff --git a/Doc/distutils/apiref.rst b/Doc/distutils/apiref.rst
--- a/Doc/distutils/apiref.rst
+++ b/Doc/distutils/apiref.rst
@@ -26,6 +26,8 @@
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 @@
*stop_after* tells :func:`setup` when to stop processing; possible values:
+ .. tabularcolumns:: |l|L|
+
+---------------+---------------------------------------------+
| value | description |
+===============+=============================================+
@@ -165,6 +169,8 @@
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 @@
The options are all boolean, and affect the values returned by :meth:`readline`
+ .. tabularcolumns:: |l|L|l|
+
+------------------+--------------------------------+---------+
| option name | description | default |
+==================+================================+=========+
diff --git a/Doc/faq/extending.rst b/Doc/faq/extending.rst
--- a/Doc/faq/extending.rst
+++ b/Doc/faq/extending.rst
@@ -2,7 +2,9 @@
Extending/Embedding FAQ
=======================
-.. contents::
+.. only:: html
+
+ .. contents::
.. highlight:: c
diff --git a/Doc/faq/general.rst b/Doc/faq/general.rst
--- a/Doc/faq/general.rst
+++ b/Doc/faq/general.rst
@@ -4,7 +4,10 @@
General Python FAQ
==================
-.. contents::
+.. only:: html
+
+ .. contents::
+
General Information
===================
diff --git a/Doc/faq/gui.rst b/Doc/faq/gui.rst
--- a/Doc/faq/gui.rst
+++ b/Doc/faq/gui.rst
@@ -4,7 +4,9 @@
Graphic User Interface FAQ
==========================
-.. contents::
+.. only:: html
+
+ .. contents::
What platform-independent GUI toolkits exist for Python?
========================================================
diff --git a/Doc/faq/library.rst b/Doc/faq/library.rst
--- a/Doc/faq/library.rst
+++ b/Doc/faq/library.rst
@@ -4,7 +4,9 @@
Library and Extension FAQ
=========================
-.. contents::
+.. only:: html
+
+ .. contents::
General Library Questions
=========================
diff --git a/Doc/faq/programming.rst b/Doc/faq/programming.rst
--- a/Doc/faq/programming.rst
+++ b/Doc/faq/programming.rst
@@ -4,7 +4,9 @@
Programming FAQ
===============
-.. contents::
+.. only:: html
+
+ .. contents::
General Questions
=================
diff --git a/Doc/faq/windows.rst b/Doc/faq/windows.rst
--- a/Doc/faq/windows.rst
+++ b/Doc/faq/windows.rst
@@ -6,7 +6,9 @@
Python on Windows FAQ
=====================
-.. contents::
+.. only:: html
+
+ .. contents::
How do I run a Python program under Windows?
--------------------------------------------
diff --git a/Doc/howto/logging.rst b/Doc/howto/logging.rst
--- a/Doc/howto/logging.rst
+++ b/Doc/howto/logging.rst
@@ -63,6 +63,8 @@
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 |
+==============+=============================================+
diff --git a/Doc/install/index.rst b/Doc/install/index.rst
--- a/Doc/install/index.rst
+++ b/Doc/install/index.rst
@@ -235,6 +235,8 @@
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 |
+=================+=====================================================+==================================================+=======+
diff --git a/Doc/library/codecs.rst b/Doc/library/codecs.rst
--- a/Doc/library/codecs.rst
+++ b/Doc/library/codecs.rst
@@ -320,6 +320,8 @@
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 @@
* 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 @@
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 |
+====================+===========================+================+===========================+
diff --git a/Doc/library/locale.rst b/Doc/library/locale.rst
--- a/Doc/library/locale.rst
+++ b/Doc/library/locale.rst
@@ -59,6 +59,8 @@
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 |
+======================+=====================================+================================+
diff --git a/Doc/library/logging.rst b/Doc/library/logging.rst
--- a/Doc/library/logging.rst
+++ b/Doc/library/logging.rst
@@ -893,6 +893,8 @@
The following keyword arguments are supported.
+ .. tabularcolumns:: |l|L|
+
+--------------+---------------------------------------------+
| Format | Description |
+==============+=============================================+
diff --git a/Doc/library/subprocess.rst b/Doc/library/subprocess.rst
--- a/Doc/library/subprocess.rst
+++ b/Doc/library/subprocess.rst
@@ -145,6 +145,8 @@
.. versionadded:: 2.7
+ ..
+
.. warning::
Invoking the system shell with ``shell=True`` can be a security hazard
diff --git a/Doc/library/sys.rst b/Doc/library/sys.rst
--- a/Doc/library/sys.rst
+++ b/Doc/library/sys.rst
@@ -302,6 +302,8 @@
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 @@
A struct sequence that holds information about Python's
internal representation of integers. The attributes are read only.
+ .. tabularcolumns:: |l|L|
+
+-------------------------+----------------------------------------------+
| Attribute | Explanation |
+=========================+==============================================+
diff --git a/Doc/library/turtle.rst b/Doc/library/turtle.rst
--- a/Doc/library/turtle.rst
+++ b/Doc/library/turtle.rst
@@ -2173,9 +2173,11 @@
The demoscripts are:
+.. tabularcolumns:: |l|L|L|
+
+----------------+------------------------------+-----------------------+
| Name | Description | Features |
-+----------------+------------------------------+-----------------------+
++================+==============================+=======================+
| bytedesign | complex classical | :func:`tracer`, delay,|
| | turtlegraphics pattern | :func:`update` |
+----------------+------------------------------+-----------------------+
diff --git a/Doc/library/warnings.rst b/Doc/library/warnings.rst
--- a/Doc/library/warnings.rst
+++ b/Doc/library/warnings.rst
@@ -57,6 +57,8 @@
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 |
+==================================+===============================================+
diff --git a/Doc/library/xml.etree.elementtree.rst b/Doc/library/xml.etree.elementtree.rst
--- a/Doc/library/xml.etree.elementtree.rst
+++ b/Doc/library/xml.etree.elementtree.rst
@@ -312,6 +312,8 @@
Supported XPath syntax
^^^^^^^^^^^^^^^^^^^^^^
+.. tabularcolumns:: |l|L|
+
+-----------------------+------------------------------------------------------+
| Syntax | Meaning |
+=======================+======================================================+
diff --git a/Doc/reference/datamodel.rst b/Doc/reference/datamodel.rst
--- a/Doc/reference/datamodel.rst
+++ b/Doc/reference/datamodel.rst
@@ -481,6 +481,8 @@
Special attributes:
+ .. tabularcolumns:: |l|L|l|
+
+-----------------------+-------------------------------+-----------+
| Attribute | Meaning | |
+=======================+===============================+===========+
diff --git a/Doc/reference/expressions.rst b/Doc/reference/expressions.rst
--- a/Doc/reference/expressions.rst
+++ b/Doc/reference/expressions.rst
@@ -1370,7 +1370,7 @@
| :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 |
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list