summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTrent Nelson <trent@trent.me>2012-10-16 15:10:40 (GMT)
committerTrent Nelson <trent@trent.me>2012-10-16 15:10:40 (GMT)
commitce5a56e9851a65a94b24b27ec6e55d4c47d7e46c (patch)
treef456fde4c23871f3b57a55d8f7fd081fc84305a0
parentfcb009c9d675b2ca0eafd01d5999cd6038d7d654 (diff)
parentba6a6cfbbc7359a871ef090f06ffeef1fb53e092 (diff)
downloadcpython-ce5a56e9851a65a94b24b27ec6e55d4c47d7e46c.zip
cpython-ce5a56e9851a65a94b24b27ec6e55d4c47d7e46c.tar.gz
cpython-ce5a56e9851a65a94b24b27ec6e55d4c47d7e46c.tar.bz2
Merge heads.
-rw-r--r--Lib/test/test_cookie.py7
1 files changed, 4 insertions, 3 deletions
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 @@ 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()