merge from 3.2

This commit is contained in:
Senthil Kumaran 2011-07-04 11:44:17 -07:00
commit 8fbfc12f5e
2 changed files with 2 additions and 2 deletions

View file

@ -1267,7 +1267,7 @@ Supported operations:
subtracting their UTC offsets (obtained from ``self.utcoffset()``). In order
to stop mixed-type comparisons from falling back to the default comparison by
object address, when a :class:`time` object is compared to an object of a
different type, :exc:`TypeError` is raised unless the comparison is ``==`` or
different type, :exc:`TypeError` is raised unless the comparison is ``==`` or
``!=``. The latter cases return :const:`False` or :const:`True`, respectively.
* hash, use as dict key

View file

@ -1826,7 +1826,7 @@ Files and Directories
.. note::
The exact meaning and resolution of the :attr:`st_atime`,
The exact meaning and resolution of the :attr:`st_atime`,
:attr:`st_mtime`, and :attr:`st_ctime` attributes depend on the operating
system and the file system. For example, on Windows systems using the FAT
or FAT32 file systems, :attr:`st_mtime` has 2-second resolution, and