commit ce5a56e9851a65a94b24b27ec6e55d4c47d7e46c
author Trent Nelson <trent@trent.me> Tue Oct 16 11:10:40 2012 -0400
committer Trent Nelson <trent@trent.me> Tue Oct 16 11:10:40 2012 -0400
tree f456fde4c23871f3b57a55d8f7fd081fc84305a0
parent fcb009c9d675b2ca0eafd01d5999cd6038d7d654
parent ba6a6cfbbc7359a871ef090f06ffeef1fb53e092

Merge heads.

Lib/test/test_cookie.py

diff --git a/Lib/test/test_cookie.py b/Lib/test/test_cookie.py
index 1fb9b7d..816133e 100644
--- a/Lib/test/test_cookie.py
+++ b/Lib/test/test_cookie.py
@@ -90,9 +90,10 @@
 
 def test_main():
     run_unittest(CookieTests)
-    with check_warnings(('.+Cookie class is insecure; do not use it',
-                         DeprecationWarning)):
-        run_doctest(Cookie)
+    if Cookie.__doc__ is not None:
+        with check_warnings(('.+Cookie class is insecure; do not use it',
+                             DeprecationWarning)):
+            run_doctest(Cookie)
 
 if __name__ == '__main__':
     test_main()