[Python-checkins] cpython (merge 2.7 -> 2.7): Merge heads.
trent.nelson
python-checkins at python.org
Tue Oct 16 17:11:31 CEST 2012
http://hg.python.org/cpython/rev/66ac8951fa86
changeset: 79762:66ac8951fa86
branch: 2.7
parent: 79758:c35db4960d1c
parent: 79757:ad0efab568ec
user: Trent Nelson <trent at trent.me>
date: Tue Oct 16 11:10:40 2012 -0400
summary:
Merge heads.
files:
Lib/test/test_cookie.py | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/Lib/test/test_cookie.py b/Lib/test/test_cookie.py
--- 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()
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list