diff options
| author | Senthil Kumaran <senthil@uthcode.com> | 2011-07-04 18:44:17 (GMT) |
|---|---|---|
| committer | Senthil Kumaran <senthil@uthcode.com> | 2011-07-04 18:44:17 (GMT) |
| commit | 8fbfc12f5e156e753f40853254ed3fb57be03639 (patch) | |
| tree | 95f1da25fd65fcec8f4e7933ad6aa65ad3844dec /Doc | |
| parent | 276a58b8218ba2e6c13114ce3942d25328d0e8ee (diff) | |
| parent | 3aac1794983715992b8f7f57ea627b681088e3e3 (diff) | |
| download | cpython-8fbfc12f5e156e753f40853254ed3fb57be03639.zip cpython-8fbfc12f5e156e753f40853254ed3fb57be03639.tar.gz cpython-8fbfc12f5e156e753f40853254ed3fb57be03639.tar.bz2 | |
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 c8e22f1..3bda2ab 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 77a28b4..2cdd102 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 |