Update the cookie documentation. Use SimpleCookie instead of SmartCookie/SerialCookie.

diff --git a/Doc/library/cookie.rst b/Doc/library/cookie.rst
index b6a85f5dffd7711dd837de6718c91264e5b28a39..3bdc61ab5000aa6effd08713a76861c58027fc7c 100644 (file)
--- a/Doc/library/cookie.rst
+++ b/Doc/library/cookie.rst
@@ -235,8 +235,6 @@ The following example demonstrates how to use the :mod:`Cookie` module.
 
    >>> import Cookie
    >>> C = Cookie.SimpleCookie()
-   >>> C = Cookie.SerialCookie()
-   >>> C = Cookie.SmartCookie()
    >>> C["fig"] = "newton"
    >>> C["sugar"] = "wafer"
    >>> print C # generate HTTP headers
@@ -245,28 +243,27 @@ The following example demonstrates how to use the :mod:`Cookie` module.
    >>> print C.output() # same thing
    Set-Cookie: fig=newton
    Set-Cookie: sugar=wafer
-   >>> C = Cookie.SmartCookie()
+   >>> C = Cookie.SimpleCookie()
    >>> C["rocky"] = "road"
    >>> C["rocky"]["path"] = "/cookie"
    >>> print C.output(header="Cookie:")
    Cookie: rocky=road; Path=/cookie
    >>> print C.output(attrs=[], header="Cookie:")
    Cookie: rocky=road
-   >>> C = Cookie.SmartCookie()
+   >>> C = Cookie.SimpleCookie()
    >>> C.load("chips=ahoy; vienna=finger") # load from a string (HTTP header)
    >>> print C
    Set-Cookie: chips=ahoy
    Set-Cookie: vienna=finger
-   >>> C = Cookie.SmartCookie()
+   >>> C = Cookie.SimpleCookie()
    >>> C.load('keebler="E=everybody; L=\\"Loves\\"; fudge=\\012;";')
    >>> print C
    Set-Cookie: keebler="E=everybody; L=\"Loves\"; fudge=\012;"
-   >>> C = Cookie.SmartCookie()
+   >>> C = Cookie.SimpleCookie()
    >>> C["oreo"] = "doublestuff"
    >>> C["oreo"]["path"] = "/"
    >>> print C
    Set-Cookie: oreo=doublestuff; Path=/
-   >>> C = Cookie.SmartCookie()
    >>> C["twix"] = "none for you"
    >>> C["twix"].value
    'none for you'
@@ -280,6 +277,8 @@ The following example demonstrates how to use the :mod:`Cookie` module.
    >>> print C
    Set-Cookie: number=7
    Set-Cookie: string=seven
+   >>> # SerialCookie and SmartCookie are deprecated
+   >>> # using it can cause security loopholes in your code.
    >>> C = Cookie.SerialCookie()
    >>> C["number"] = 7
    >>> C["string"] = "seven"