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

[terry.reedy]

https://hg.python.org/cpython/rev/da046f8587ed
changeset:   96595:da046f8587ed
branch:      3.5
parent:      96591:caaaf83a4d53
parent:      96594:c16d3f5af23f
user:        Terry Jan Reedy <tjreedy at udel.edu>
date:        Fri Jun 12 16:47:58 2015 -0400
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
@@ -4158,7 +4158,7 @@
    Dictionaries compare equal if and only if they have the same ``(key,
    value)`` pairs. Order comparisons ('<', '<=', '>=', '>') raise
    :exc:`TypeError`.
-      
+
 .. seealso::
    :class:`types.MappingProxyType` can be used to create a read-only view
    of a :class:`dict`.

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