mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-02 03:01:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 15

Merge 3.1

Browse source
This commit is contained in:
Éric Araujo 2011-04-27 16:27:38 +02:00
commit 944d16c6c4
4 changed files with 4 additions and 9 deletions
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
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

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
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

2
Doc/library/wsgiref.rst
View file

@ -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()