Merge heads.

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)