Merge heads.

This commit is contained in:
Trent Nelson 2012-10-16 11:10:40 -04:00
commit ce5a56e985
1 changed files with 4 additions and 3 deletions

View File

@ -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',
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()