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

[brett.cannon]

http://hg.python.org/cpython/rev/765ca3caee10
changeset:   76467:765ca3caee10
parent:      76466:9adfe3c0fe48
parent:      76465:8cae3ee7f691
user:        Brett Cannon <brett at python.org>
date:        Sun Apr 22 02:06:48 2012 -0400
summary:
  merge

files:
  Doc/library/http.cookies.rst |  13 +++++++++++--
  1 files changed, 11 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
@@ -17,8 +17,17 @@
 
 The module formerly strictly applied the parsing rules described in the
 :rfc:`2109` and :rfc:`2068` specifications.  It has since been discovered that
-MSIE 3.0x doesn't follow the character rules outlined in those specs.  As a
-result, the parsing rules used are a bit less strict.
+MSIE 3.0x doesn't follow the character rules outlined in those specs and also
+many current day browsers and servers have relaxed parsing rules when comes to
+Cookie handling.  As a result, the parsing rules used are a bit less strict.
+
+The character set, :data:`string.ascii_letters`, :data:`string.digits` and
+``!#$%&'*+-.^_`|~:`` denote the set of valid characters allowed by this module
+in Cookie name (as :attr:`~Morsel.key`).
+
+.. versionchanged:: 3.3
+   Allowed ':' as a valid Cookie name character.
+
 
 .. note::
 

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