diff options
| author | Éric Araujo <merwok@netwok.org> | 2011-04-27 14:27:38 (GMT) |
|---|---|---|
| committer | Éric Araujo <merwok@netwok.org> | 2011-04-27 14:27:38 (GMT) |
| commit | 944d16c6c490f5e3933f8a729d810f60d3bab1d3 (patch) | |
| tree | fa5937fc167ace98dafb8aff3e5c7f11c379e4f4 | |
| parent | 19acb88baf6026307e21d27a4bd7fb33a51344c1 (diff) | |
| parent | 9a42793761ddedc59f03a5fe0f0150e11676713f (diff) | |
| download | cpython-944d16c6c490f5e3933f8a729d810f60d3bab1d3.zip cpython-944d16c6c490f5e3933f8a729d810f60d3bab1d3.tar.gz cpython-944d16c6c490f5e3933f8a729d810f60d3bab1d3.tar.bz2 | |
Merge 3.1
| -rw-r--r-- | Doc/library/__future__.rst | 2 | ||||
| -rw-r--r-- | Doc/library/sys.rst | 4 | ||||
| -rw-r--r-- | Doc/library/wsgiref.rst | 2 | ||||
| -rw-r--r-- | 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 index 1e07f20..0acccc5 100644 --- a/Doc/library/__future__.rst +++ b/Doc/library/__future__.rst @@ -29,7 +29,7 @@ Each statement in :file:`__future__.py` is of the form:: 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 index 6fff43d..ecac1fe 100644 --- a/Doc/library/sys.rst +++ b/Doc/library/sys.rst @@ -549,8 +549,8 @@ always available. 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 index 385652b..3969ea4 100644 --- a/Doc/library/wsgiref.rst +++ b/Doc/library/wsgiref.rst @@ -690,7 +690,7 @@ input, output, and error streams. .. 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 index 4628d8a..13fa4f2 100644 --- 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. - -""" |