From ca01a768781ba5cdf768858efaabaf7759163af5 Mon Sep 17 00:00:00 2001 From: Benjamin Peterson Date: Mon, 15 Oct 2012 20:38:21 -0400 Subject: [PATCH] don't expect warnings from doctests if they can't run --- Lib/test/test_doctest.py | 4 +++- Lib/test/test_zipimport_support.py | 5 +++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Lib/test/test_doctest.py b/Lib/test/test_doctest.py index 8c87beeebca..45057c87078 100644 --- a/Lib/test/test_doctest.py +++ b/Lib/test/test_doctest.py @@ -2673,7 +2673,9 @@ def test_main(): from test import test_doctest # Ignore all warnings about the use of class Tester in this module. - deprecations = [("class Tester is deprecated", DeprecationWarning)] + deprecations = [] + if __debug__: + deprecations.append(("class Tester is deprecated", DeprecationWarning)) if sys.py3kwarning: deprecations += [("backquote not supported", SyntaxWarning), ("execfile.. not supported", DeprecationWarning)] diff --git a/Lib/test/test_zipimport_support.py b/Lib/test/test_zipimport_support.py index 199cf20e8d4..704f35c6b0e 100644 --- a/Lib/test/test_zipimport_support.py +++ b/Lib/test/test_zipimport_support.py @@ -179,9 +179,10 @@ class ZipSupportTests(ImportHooksBaseTestCase): test_zipped_doctest.test_unittest_reportflags, ] # Needed for test_DocTestParser and test_debug - deprecations = [ + deprecations = [] + if __debug__: # Ignore all warnings about the use of class Tester in this module. - ("class Tester is deprecated", DeprecationWarning)] + depcreations.append(("class Tester is deprecated", DeprecationWarning)) if sys.py3kwarning: deprecations += [ ("backquote not supported", SyntaxWarning),