Author: christian.heimes
Date: Sun Dec 9 16:58:13 2007
New Revision: 59441
Modified:
python/branches/py3k/ (props changed)
python/branches/py3k/Doc/glossary.rst
python/branches/py3k/Doc/library/warnings.rst
Log:
Merged revisions 59423-59440 via svnmerge from
svn+ssh://[EMAIL PROTECTED]/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.
........
Modified: python/branches/py3k/Doc/glossary.rst
==============================================================================
--- python/branches/py3k/Doc/glossary.rst (original)
+++ python/branches/py3k/Doc/glossary.rst Sun Dec 9 16:58:13 2007
@@ -56,7 +56,7 @@
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`.
Modified: python/branches/py3k/Doc/library/warnings.rst
==============================================================================
--- python/branches/py3k/Doc/library/warnings.rst (original)
+++ python/branches/py3k/Doc/library/warnings.rst Sun Dec 9 16:58:13 2007
@@ -198,8 +198,8 @@
*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])
_______________________________________________
Python-3000-checkins mailing list
[email protected]
http://mail.python.org/mailman/listinfo/python-3000-checkins
