[Python-checkins] cpython (merge 3.2 -> default): Merge with 3.2.

Sat Jul 30 09:00:20 CEST 2011

http://hg.python.org/cpython/rev/44641e94eeb8
changeset: 71627:44641e94eeb8
parent: 71625:221ca00121ef
parent: 71626:4bcfb24c7f1f
user: Georg Brandl <georg at python.org>
date: Sat Jul 30 09:01:03 2011 +0200
summary:
 Merge with 3.2.
files:
 Doc/library/test.rst | 18 +++++++++++-------
 1 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/Doc/library/test.rst b/Doc/library/test.rst
--- a/Doc/library/test.rst
+++ b/Doc/library/test.rst
@@ -187,19 +187,24 @@
 regression tests.
 
 
-:mod:`test.support` --- Utility functions for tests
-===================================================
+:mod:`test.support` --- Utilities for the Python test suite
+===========================================================
 
 .. module:: test.support
- :synopsis: Support for Python regression tests.
+ :synopsis: Support for Python's regression test suite.
 
 
 The :mod:`test.support` module provides support for Python's regression
-tests.
+test suite.
+
+.. note::
+ :mod:`test.support` is not a public module. It is documented here to help
+ Python developers write tests. The API of this module is subject to change
+ without backwards compatibility concerns between releases.
+
 
 This module defines the following exceptions:
 
-
 .. exception:: TestFailed
 
 Exception to be raised when a test fails. This is deprecated in favor of
@@ -213,9 +218,9 @@
 network connection) is not available. Raised by the :func:`requires`
 function.
 
+
 The :mod:`test.support` module defines the following constants:
 
-
 .. data:: verbose
 
 ``True`` when verbose output is enabled. Should be checked when more
@@ -236,7 +241,6 @@
 
 The :mod:`test.support` module defines the following functions:
 
-
 .. function:: forget(module_name)
 
 Remove the module named *module_name* from ``sys.modules`` and delete any
-- 
Repository URL: http://hg.python.org/cpython
