[Python-checkins] cpython (merge 3.1 -> 3.2): Merge 3.1

[eric.araujo]

http://hg.python.org/cpython/rev/0ff8f6105827
changeset:   69629:0ff8f6105827
branch:      3.2
parent:      69628:c981a9824122
parent:      69627:aca7a3091c9b
user:        Éric Araujo <merwok at netwok.org>
date:        Wed Apr 27 16:27:38 2011 +0200
summary:
  Merge 3.1

files:
  Doc/library/__future__.rst         |  2 +-
  Doc/library/sys.rst                |  4 ++--
  Doc/library/wsgiref.rst            |  2 +-
  Lib/test/tracedmodules/__init__.py |  5 -----
  4 files changed, 4 insertions(+), 9 deletions(-)


diff --git a/Doc/library/__future__.rst b/Doc/library/__future__.rst
--- a/Doc/library/__future__.rst
+++ b/Doc/library/__future__.rst
@@ -29,7 +29,7 @@
 
 
 where, normally, *OptionalRelease* is less than *MandatoryRelease*, and both are
-5-tuples of the same form as ``sys.version_info``::
+5-tuples of the same form as :data:`sys.version_info`::
 
    (PY_MAJOR_VERSION, # the 2 in 2.1.0a3; an int
     PY_MINOR_VERSION, # the 1; an int
diff --git a/Doc/library/sys.rst b/Doc/library/sys.rst
--- a/Doc/library/sys.rst
+++ b/Doc/library/sys.rst
@@ -549,8 +549,8 @@
 
    This is called ``hexversion`` since it only really looks meaningful when viewed
    as the result of passing it to the built-in :func:`hex` function.  The
-   ``version_info`` value may be used for a more human-friendly encoding of the
-   same information.
+   struct sequence  :data:`sys.version_info` may be used for a more human-friendly
+   encoding of the same information.
 
    The ``hexversion`` is a 32-bit number with the following layout
 
diff --git a/Doc/library/wsgiref.rst b/Doc/library/wsgiref.rst
--- a/Doc/library/wsgiref.rst
+++ b/Doc/library/wsgiref.rst
@@ -690,7 +690,7 @@
    .. attribute:: BaseHandler.wsgi_file_wrapper
 
       A ``wsgi.file_wrapper`` factory, or ``None``.  The default value of this
-      attribute is the :class:`FileWrapper` class from :mod:`wsgiref.util`.
+      attribute is the :class:`wsgiref.util.FileWrapper` class.
 
 
    .. method:: BaseHandler.sendfile()
diff --git a/Lib/test/tracedmodules/__init__.py b/Lib/test/tracedmodules/__init__.py
--- a/Lib/test/tracedmodules/__init__.py
+++ b/Lib/test/tracedmodules/__init__.py
@@ -2,8 +2,3 @@
 that the exact location of functions in these modules is important, as trace.py
 takes the real line numbers into account.
 """
-"""This directory contains modules that help testing the trace.py module. Note
-that the exact location of functions in these modules is important, as trace.py
-takes the real line numbers into account.
-
-"""

-- 
Repository URL: http://hg.python.org/cpython