Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Merged revisions 59423-59440 via svnmerge from 

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r59427 | georg.brandl | 2007-12-08 18:56:07 +0100 (Sat, 08 Dec 2007) | 2 lines

  Adapt style.
........
  r59435 | brett.cannon | 2007-12-09 06:09:37 +0100 (Sun, 09 Dec 2007) | 2 lines

  Use a versionchanged directive.
........
  r59436 | georg.brandl | 2007-12-09 09:54:02 +0100 (Sun, 09 Dec 2007) | 2 lines

  #1575: the Mac readme is now one level up.
........
  r59437 | georg.brandl | 2007-12-09 09:59:45 +0100 (Sun, 09 Dec 2007) | 2 lines

  Remove all tabs in that file.
........
This commit is contained in:
Christian Heimes 2007-12-09 15:58:13 +00:00
parent cc595bd546
commit 3279b5df3c
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Doc/glossary.rst
View File

@ -56,7 +56,7 @@ Glossary
it's almost certain you can safely ignore them.
context manager
Objects which control the environment seen in a :keyword:`with`
An objects that controls the environment seen in a :keyword:`with`
statement by defining :meth:`__enter__` and :meth:`__exit__` methods.
See :pep:`343`.

4
Doc/library/warnings.rst
View File

@ -198,8 +198,8 @@ Available Functions
*module_globals*, if supplied, should be the global namespace in use by the code
for which the warning is issued. (This argument is used to support displaying
source for modules found in zipfiles or other non-filesystem import sources, and
was added in Python 2.5.)
source for modules found in zipfiles or other non-filesystem import
sources).
.. function:: showwarning(message, category, filename, lineno[, file])