[Python-checkins] cpython (merge 3.4 -> default): Merge with 3.4

terry.reedy python-checkins at python.org
Fri May 23 06:35:18 CEST 2014


http://hg.python.org/cpython/rev/f55ec61620c7
changeset:   90795:f55ec61620c7
parent:      90792:31d3cd57ad20
parent:      90794:3f2b6034b73a
user:        Terry Jan Reedy <tjreedy at udel.edu>
date:        Fri May 23 00:34:38 2014 -0400
summary:
  Merge with 3.4

files:
  Doc/tutorial/datastructures.rst |  9 +++++++--
  Misc/ACKS                       |  1 +
  2 files changed, 8 insertions(+), 2 deletions(-)


diff --git a/Doc/tutorial/datastructures.rst b/Doc/tutorial/datastructures.rst
--- a/Doc/tutorial/datastructures.rst
+++ b/Doc/tutorial/datastructures.rst
@@ -111,10 +111,15 @@
    >>> a.sort()
    >>> a
    [-1, 1, 66.25, 333, 333, 1234.5]
+   >>> a.pop()
+   1234.5
+   >>> a
+   [-1, 1, 66.25, 333, 333]
 
 You might have noticed that methods like ``insert``, ``remove`` or ``sort`` that
-modify the list have no return value printed -- they return ``None``. [1]_  This
-is a design principle for all mutable data structures in Python.
+only modify the list have no return value printed -- they return the default
+``None``. [1]_  This is a design principle for all mutable data structures in
+Python.
 
 
 .. _tut-lists-as-stacks:
diff --git a/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -508,6 +508,7 @@
 Lynda Hardman
 Derek Harland
 Jason Harper
+David Harrigan
 Brian Harring
 Jonathan Hartley
 Travis B. Hartwell

-- 
Repository URL: http://hg.python.org/cpython


More information about the Python-checkins mailing list