Merge heads.

ce5a56e9 · Trent Nelson · fcb009c9 · ba6a6cfb · ce5a56e9
Commit ce5a56e9 authored Oct 16, 2012 by Trent Nelson
Hide 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,9 +90,10 @@ class CookieTests(unittest.TestCase):
 def test_main():
    run_unittest(CookieTests)
-    with check_warnings(('.+Cookie class is insecure; do not use it',
+    if Cookie.__doc__ is not None:
-                         DeprecationWarning)):
+        with check_warnings(('.+Cookie class is insecure; do not use it',
-        run_doctest(Cookie)
+                             DeprecationWarning)):
+            run_doctest(Cookie)
 if __name__ == '__main__':
    test_main()