[Python-checkins] cpython (merge 3.2 -> 3.2): Merge

[jesus.cea]

http://hg.python.org/cpython/rev/9a817ab166e0
changeset:   68581:9a817ab166e0
branch:      3.2
parent:      68578:6544accfefc3
parent:      68579:bca545c0941a
user:        Jesus Cea <jcea at jcea.es>
date:        Wed Mar 16 01:40:50 2011 +0100
summary:
  Merge

files:
  

diff --git a/Lib/test/test_gdb.py b/Lib/test/test_gdb.py
--- a/Lib/test/test_gdb.py
+++ b/Lib/test/test_gdb.py
@@ -127,6 +127,9 @@
                           " inferior's thread library, thread debugging will"
                           " not be available.\n",
                           '')
+        err = err.replace("warning: Cannot initialize thread debugging"
+                          " library: Debugger service failed\n",
+                          '')
 
         # Ensure no unexpected error messages:
         self.assertEqual(err, '')

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