mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 17:08:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

Merged revisions 66134,66136,66143,66154-66155,66190 via svnmerge from

Browse source 
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
........
This commit is contained in:
Benjamin Peterson 2008-09-03 22:22:18 +00:00
parent a64072f994
commit dcc1e11760
2 changed files with 45 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Doc/library/warnings.rst
View file

@ -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