[Python-checkins] cpython (merge 3.3 -> default): #17833: merge with 3.3

[david.malcolm]

http://hg.python.org/cpython/rev/6d971b172389
changeset:   83649:6d971b172389
parent:      83647:3e1c45f5c585
parent:      83648:f4a6b731905a
user:        David Malcolm <dmalcolm at redhat.com>
date:        Mon May 06 14:51:13 2013 -0400
summary:
  #17833: merge with 3.3

files:
  Misc/NEWS              |  3 +++
  Tools/gdb/libpython.py |  2 +-
  2 files changed, 4 insertions(+), 1 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -215,6 +215,9 @@
 Tests
 -----
 
+- Issue #17833: Fix test_gdb failures seen on machines where debug symbols
+  for glibc are available (seen on PPC64 Linux).
+
 - Issue #7855: Add tests for ctypes/winreg for issues found in IronPython.
   Initial patch by Dino Viehland.
 
diff --git a/Tools/gdb/libpython.py b/Tools/gdb/libpython.py
--- a/Tools/gdb/libpython.py
+++ b/Tools/gdb/libpython.py
@@ -1462,7 +1462,7 @@
         # This assumes the _POSIX_THREADS version of Python/ceval_gil.h:
         name = self._gdbframe.name()
         if name:
-            return name.startswith('pthread_cond_timedwait')
+            return 'pthread_cond_timedwait' in name
 
     def is_gc_collect(self):
         '''Is this frame "collect" within the garbage-collector?'''

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