diff options
author | Georg Brandl <georg@python.org> | 2010-03-21 19:34:26 (GMT) |
---|---|---|
committer | Georg Brandl <georg@python.org> | 2010-03-21 19:34:26 (GMT) |
commit | 4c86cb31e2808ad47e6780a4a1bf3a15ec0d4b2e (patch) | |
tree | dd304b6830edc24aa1c690840ea49f1b0a8d9f33 /Doc/library/sys.rst | |
parent | d4e7addd11b586576f98129fe83d21cab173e181 (diff) | |
download | cpython-4c86cb31e2808ad47e6780a4a1bf3a15ec0d4b2e.zip cpython-4c86cb31e2808ad47e6780a4a1bf3a15ec0d4b2e.tar.gz cpython-4c86cb31e2808ad47e6780a4a1bf3a15ec0d4b2e.tar.bz2 |
Merged revisions 78859-78860,78952,79168-79169,79173,79176,79178-79179,79181,79184-79185,79192,79212 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r78859 | georg.brandl | 2010-03-12 10:57:43 +0100 (Fr, 12 Mär 2010) | 1 line
Get rid of backticks.
........
r78860 | georg.brandl | 2010-03-12 11:02:03 +0100 (Fr, 12 Mär 2010) | 1 line
Fix warnings from "make check".
........
r78952 | georg.brandl | 2010-03-14 10:55:08 +0100 (So, 14 Mär 2010) | 1 line
#8137: add iso-8859-16 to the standard encodings table.
........
r79168 | georg.brandl | 2010-03-21 10:01:27 +0100 (So, 21 Mär 2010) | 1 line
Fix some issues found by Jacques Ducasse on the docs list.
........
r79169 | georg.brandl | 2010-03-21 10:02:01 +0100 (So, 21 Mär 2010) | 1 line
Remove the "built-in objects" file. It only contained two paragraphs of which only one contained useful information, which belongs in the ref manual however.
........
r79173 | georg.brandl | 2010-03-21 10:09:38 +0100 (So, 21 Mär 2010) | 1 line
Document that GzipFile supports iteration.
........
r79176 | georg.brandl | 2010-03-21 10:17:41 +0100 (So, 21 Mär 2010) | 1 line
Introduce copy by slicing, used in later chapters.
........
r79178 | georg.brandl | 2010-03-21 10:28:16 +0100 (So, 21 Mär 2010) | 1 line
Clarify that for shell=True, the shell PID will be the child PID.
........
r79179 | georg.brandl | 2010-03-21 10:37:54 +0100 (So, 21 Mär 2010) | 1 line
Mention inefficiency of lists as queues, add link to collections.deque discussion.
........
r79181 | georg.brandl | 2010-03-21 10:51:16 +0100 (So, 21 Mär 2010) | 1 line
Update os.kill() emulation example for Windows to use ctypes.
........
r79184 | georg.brandl | 2010-03-21 10:58:36 +0100 (So, 21 Mär 2010) | 1 line
Update text for newest US DST regulation. The sample file already has the calculation right.
........
r79185 | georg.brandl | 2010-03-21 11:02:47 +0100 (So, 21 Mär 2010) | 1 line
Include structmember.h correctly.
........
r79192 | georg.brandl | 2010-03-21 12:50:58 +0100 (So, 21 Mär 2010) | 1 line
Remove leftover word.
........
r79212 | georg.brandl | 2010-03-21 20:01:38 +0100 (So, 21 Mär 2010) | 1 line
Fix plural.
........
Diffstat (limited to 'Doc/library/sys.rst')
-rw-r--r-- | Doc/library/sys.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/library/sys.rst b/Doc/library/sys.rst index 7041dd4..b8fe702 100644 --- a/Doc/library/sys.rst +++ b/Doc/library/sys.rst @@ -405,7 +405,7 @@ always available. specific. If given, *default* will be returned if the object does not provide means to - retrieve the size. Otherwise a `TypeError` will be raised. + retrieve the size. Otherwise a :exc:`TypeError` will be raised. :func:`getsizeof` calls the object's ``__sizeof__`` method and adds an additional garbage collector overhead if the object is managed by the garbage |