[Python-checkins] cpython (merge default -> default): Branch merge
eric.araujo
python-checkins at python.org
Tue Aug 16 19:14:32 CEST 2011
http://hg.python.org/cpython/rev/dcd2480b9a76
changeset: 71880:dcd2480b9a76
parent: 71875:5d4438001069
parent: 71879:a57c90bc5597
user: Éric Araujo <merwok at netwok.org>
date: Tue Aug 16 19:13:58 2011 +0200
summary:
Branch merge
files:
Doc/library/collections.abc.rst | 5 +++--
Doc/library/collections.rst | 2 +-
Makefile.pre.in | 2 +-
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/Doc/library/collections.abc.rst b/Doc/library/collections.abc.rst
--- a/Doc/library/collections.abc.rst
+++ b/Doc/library/collections.abc.rst
@@ -6,6 +6,9 @@
.. moduleauthor:: Raymond Hettinger <python at rcn.com>
.. sectionauthor:: Raymond Hettinger <python at rcn.com>
+.. versionadded:: 3.3
+ Formerly, this module was part of the :mod:`collections` module.
+
.. testsetup:: *
from collections import *
@@ -20,8 +23,6 @@
can be used to test whether a class provides a particular interface; for
example, whether it is hashable or whether it is a mapping.
-.. versionchanged:: 3.3
- Formerly, this module was part of the :mod:`collections` module.
.. _collections-abstract-base-classes:
diff --git a/Doc/library/collections.rst b/Doc/library/collections.rst
--- a/Doc/library/collections.rst
+++ b/Doc/library/collections.rst
@@ -72,7 +72,7 @@
A user updateable list of mappings. The list is ordered from
first-searched to last-searched. It is the only stored state and can
- modified to change which mappings are searched. The list should
+ be modified to change which mappings are searched. The list should
always contain at least one mapping.
.. method:: new_child()
diff --git a/Makefile.pre.in b/Makefile.pre.in
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -1359,7 +1359,7 @@
-o -name .hgignore \
-o -name .bzrignore \
-o -name MANIFEST \
- -print
+ -o -print
# Perform some verification checks on any modified files.
patchcheck:
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list