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

[terry.reedy]

https://hg.python.org/cpython/rev/64e45efdc3e2
changeset:   93826:64e45efdc3e2
parent:      93824:b03d58e6ce6a
parent:      93825:1ace87a5e10c
user:        Terry Jan Reedy <tjreedy at udel.edu>
date:        Wed Dec 10 18:50:13 2014 -0500
summary:
  Merge with 3.4

files:
  Doc/library/stdtypes.rst |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst
--- a/Doc/library/stdtypes.rst
+++ b/Doc/library/stdtypes.rst
@@ -3762,7 +3762,7 @@
       not in the map.
 
       .. index:: __missing__()
-  
+
       If a subclass of dict defines a method :meth:`__missing__` and *key*
       is not present, the ``d[key]`` operation calls that method with the key *key*
       as argument.  The ``d[key]`` operation then returns or raises whatever is

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