Merge heads.

ce5a56e9 · Trent Nelson · fcb009c9 · ba6a6cfb · ce5a56e9
Commit ce5a56e9 authored Oct 16, 2012 by Trent Nelson
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 3 deletions

Lib/test/test_cookie.py Lib/test/test_cookie.py +4 -3

No files found.
--- a/Lib/test/test_cookie.py
+++ b/Lib/test/test_cookie.py
@@ -90,6 +90,7 @@ class CookieTests(unittest.TestCase):

 def test_main():
    run_unittest(CookieTests)
+    if Cookie.__doc__ is not None:
        with check_warnings(('.+Cookie class is insecure; do not use it',
                             DeprecationWarning)):
            run_doctest(Cookie)