Merge heads

This commit is contained in:
Andrew Svetlov 2012-10-04 19:55:04 +03:00
commit df5959371f

View file

@ -557,7 +557,7 @@ The module defines the following functions and data items:
:exc:`TypeError` is raised. :exc:`TypeError` is raised.
.. versionchanged:: 3.3 .. versionchanged:: 3.3
:attr:`tm_gmtoff` and :attr:`tm_zone` attributes are avaliable on platforms :attr:`tm_gmtoff` and :attr:`tm_zone` attributes are available on platforms
with C library supporting the corresponding fields in ``struct tm``. with C library supporting the corresponding fields in ``struct tm``.
.. function:: time() .. function:: time()