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

Fri Jun 12 22:49:31 CEST 2015

https://hg.python.org/cpython/rev/a8f8ada7825c
changeset: 96596:a8f8ada7825c
parent: 96592:02328d76fa77
parent: 96595:da046f8587ed
user: Terry Jan Reedy <tjreedy at udel.edu>
date: Fri Jun 12 16:48:30 2015 -0400
summary:
 Merge with 3.5
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
