[Python-checkins] cpython: #2211: Fix typo, address missed review comment.

Mon Mar 30 17:55:24 CEST 2015

https://hg.python.org/cpython/rev/a70ca6f35327
changeset: 95300:a70ca6f35327
user: R David Murray <rdmurray at bitdance.com>
date: Mon Mar 30 11:48:50 2015 -0400
summary:
 #2211: Fix typo, address missed review comment.
files:
 Doc/library/http.cookies.rst | 6 ++++++
 Doc/whatsnew/3.5.rst | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/Doc/library/http.cookies.rst b/Doc/library/http.cookies.rst
--- a/Doc/library/http.cookies.rst
+++ b/Doc/library/http.cookies.rst
@@ -228,6 +228,12 @@
 return a Morsel object instead of a dict.
 
 
+.. method:: Morsel.setdefault(key, value=None)
+
+ Raise an error if key is not a valid :rfc:`2109` attribute, otherwise
+ behave the same as :meth:`dict.setdefault`.
+
+
 .. _cookie-example:
 
 Example
diff --git a/Doc/whatsnew/3.5.rst b/Doc/whatsnew/3.5.rst
--- a/Doc/whatsnew/3.5.rst
+++ b/Doc/whatsnew/3.5.rst
@@ -679,8 +679,8 @@
 consistent: morsel comparison now takes the :attr:`~http.cookies.Morsel.key`
 and :attr:`~http.cookies.Morsel.value` into account,
 :meth:`~http.cookies.Morsel.copy` now results in a
- :class:`~http.cookies.Morsel` instance rather than a *dict*, and
- :meth:`~http.cookies.Morsel.update` will no raise an exception if any of the
+ :class:`~http.cookies.Morsel` instance rather than a :class:`dict`, and
+ :meth:`~http.cookies.Morsel.update` will now raise an exception if any of the
 keys in the update dictionary are invalid. In addition, the undocumented
 *LegalChars* parameter of :func:`~http.cookies.Morsel.set` is deprecated and
 is now ignored. (:issue:`2211`)
-- 
Repository URL: https://hg.python.org/cpython
