diff options
| author | Benjamin Peterson <benjamin@python.org> | 2008-09-03 22:22:18 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2008-09-03 22:22:18 (GMT) |
| commit | dcc1e117604cc64dfa03a703391fbaeba654181a (patch) | |
| tree | f708dbb01a7da17982a2df4eac69e07d1f390ee5 /Doc/library/warnings.rst | |
| parent | a64072f994d8ddc748948e0b8376e69881cf26ac (diff) | |
| download | cpython-dcc1e117604cc64dfa03a703391fbaeba654181a.zip cpython-dcc1e117604cc64dfa03a703391fbaeba654181a.tar.gz cpython-dcc1e117604cc64dfa03a703391fbaeba654181a.tar.bz2 | |
Merged revisions 66134,66136,66143,66154-66155,66190 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r66134 | andrew.kuchling | 2008-09-01 20:13:42 -0500 (Mon, 01 Sep 2008) | 1 line
Describe the __hash__ changes
........
r66136 | andrew.kuchling | 2008-09-01 20:39:18 -0500 (Mon, 01 Sep 2008) | 1 line
typo fix
........
r66143 | mark.summerfield | 2008-09-02 02:23:16 -0500 (Tue, 02 Sep 2008) | 3 lines
a typo
........
r66154 | andrew.kuchling | 2008-09-02 08:06:00 -0500 (Tue, 02 Sep 2008) | 1 line
Clarify example; add imports
........
r66155 | andrew.kuchling | 2008-09-02 08:08:11 -0500 (Tue, 02 Sep 2008) | 1 line
Add e-mail address
........
r66190 | benjamin.peterson | 2008-09-03 16:48:20 -0500 (Wed, 03 Sep 2008) | 1 line
3.0 still has the old threading names
........
Diffstat (limited to 'Doc/library/warnings.rst')
| -rw-r--r-- | Doc/library/warnings.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/library/warnings.rst b/Doc/library/warnings.rst index ccd7b44..e3d3b5b 100644 --- a/Doc/library/warnings.rst +++ b/Doc/library/warnings.rst @@ -253,7 +253,7 @@ Available Classes .. class:: catch_warnings([\*, record=False, module=None]) - A context manager that guards the warnings filter from being permanentally + A context manager that guards the warnings filter from being permanently mutated. The manager returns an instance of :class:`WarningsRecorder`. The *record* argument specifies whether warnings that would typically be handled by :func:`showwarning` should instead be recorded by the |