traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge 3.1

This commit is contained in:
Éric Araujo 2011-04-27 16:27:38 +02:00
parent 19acb88baf 9a42793761
commit 944d16c6c4
4 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Doc/library/__future__.rst
View File

@ -29,7 +29,7 @@ Each statement in :file:`__future__.py` is of the form::
where, normally, *OptionalRelease* is less than *MandatoryRelease*, and both are 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_MAJOR_VERSION, # the 2 in 2.1.0a3; an int
PY_MINOR_VERSION, # the 1; an int PY_MINOR_VERSION, # the 1; an int

4
Doc/library/sys.rst
View File

@ -549,8 +549,8 @@ always available.
This is called ``hexversion`` since it only really looks meaningful when viewed 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 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 struct sequence :data:`sys.version_info` may be used for a more human-friendly
same information. encoding of the same information.
The ``hexversion`` is a 32-bit number with the following layout The ``hexversion`` is a 32-bit number with the following layout

2
Doc/library/wsgiref.rst
View File

@ -690,7 +690,7 @@ input, output, and error streams.
.. attribute:: BaseHandler.wsgi_file_wrapper .. attribute:: BaseHandler.wsgi_file_wrapper
A ``wsgi.file_wrapper`` factory, or ``None``. The default value of this 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() .. method:: BaseHandler.sendfile()

5
Lib/test/tracedmodules/__init__.py
View File

@ -2,8 +2,3 @@
that the exact location of functions in these modules is important, as trace.py that the exact location of functions in these modules is important, as trace.py
takes the real line numbers into account. 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.
"""