diff options
| author | Senthil Kumaran <senthil@uthcode.com> | 2011-07-04 11:44:17 -0700 |
|---|---|---|
| committer | Senthil Kumaran <senthil@uthcode.com> | 2011-07-04 11:44:17 -0700 |
| commit | 73057c786b8b170dd51ca51aba30e83130b7eb74 (patch) | |
| tree | 95d3f5e02a0e53f247eb30a6e935302b13cd2f38 /Doc | |
| parent | f587d4d9948b388a440c4b4ced069345ea0b05b1 (diff) | |
| parent | fe20e1d8d1af054ba7c66cff3d7bf71909a51c30 (diff) | |
| download | cpython-73057c786b8b170dd51ca51aba30e83130b7eb74.tar.gz | |
merge from 3.2
Diffstat (limited to 'Doc')
| -rw-r--r-- | Doc/library/datetime.rst | 2 | ||||
| -rw-r--r-- | Doc/library/os.rst | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Doc/library/datetime.rst b/Doc/library/datetime.rst index c8e22f1655..3bda2abe5b 100644 --- a/Doc/library/datetime.rst +++ b/Doc/library/datetime.rst @@ -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 diff --git a/Doc/library/os.rst b/Doc/library/os.rst index 77a28b4f11..2cdd102ba1 100644 --- a/Doc/library/os.rst +++ b/Doc/library/os.rst @@ -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 |