[Python-checkins] cpython (merge 3.2 -> default): Merge: test_tools fix: don't import analyze_dxp if no _thread module

[r.david.murray]

http://hg.python.org/cpython/rev/0da8ea486026
changeset:   76109:0da8ea486026
parent:      76107:696cb524322a
parent:      76108:058f9a9f97cd
user:        R David Murray <rdmurray at bitdance.com>
date:        Wed Apr 04 22:38:26 2012 -0400
summary:
  Merge: test_tools fix: don't import analyze_dxp if no _thread module

files:
  Lib/test/test_tools.py |  1 +
  1 files changed, 1 insertions(+), 0 deletions(-)


diff --git a/Lib/test/test_tools.py b/Lib/test/test_tools.py
--- a/Lib/test/test_tools.py
+++ b/Lib/test/test_tools.py
@@ -63,6 +63,7 @@
         for fn in self.windows_only:
             __import__(fn[:-3])
 
+    @unittest.skipIf(not support.threading, "test requires _thread module")
     def test_analyze_dxp_import(self):
         if hasattr(sys, 'getdxp'):
             import analyze_dxp

-- 
Repository URL: http://hg.python.org/cpython