From: Victor Stinner <victor.stinner@haypocalc.com>
Date: Tue, 27 Apr 2010 21:51:26 +0000 (+0000)
Subject: Issue #7449 part 3, test_doctest: import trace module in test_coverage()
X-Git-Tag: v2.7b2~171
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=edb9f873cfbf9d7f05cb73fa19036831813b28be;p=thirdparty%2FPython%2Fcpython.git

Issue #7449 part 3, test_doctest: import trace module in test_coverage()

Import trace module fail if the threading module is missing. test_coverage() is
only used if test_doctest.py is used with the -c option. This commit allows to
execute the test suite without thread support.

Move "import trace" in test_coverage() and use
test_support.import_module('trace').
---

diff --git a/Lib/test/test_doctest.py b/Lib/test/test_doctest.py
index 4fc2f9f40658..df65d7e067fb 100644
--- a/Lib/test/test_doctest.py
+++ b/Lib/test/test_doctest.py
@@ -2468,8 +2468,9 @@ def test_main():
         # Check the doctest cases defined here:
         test_support.run_doctest(test_doctest, verbosity=True)
 
-import trace, sys
+import sys
 def test_coverage(coverdir):
+    trace = test_support.import_module('trace')
     tracer = trace.Trace(ignoredirs=[sys.prefix, sys.exec_prefix,],
                          trace=0, count=1)
     tracer.run('reload(doctest); test_main()')