diff options
| author | David Malcolm <dmalcolm@redhat.com> | 2013-05-06 18:51:13 (GMT) |
|---|---|---|
| committer | David Malcolm <dmalcolm@redhat.com> | 2013-05-06 18:51:13 (GMT) |
| commit | 1df37c657d7b32cfc7e765f13323415ef1c5be31 (patch) | |
| tree | 1d374df7ba0754a88b7bd5533528bc8e9fa07af4 | |
| parent | 5c29bb331a6b36533f57561f7873ee0564341d72 (diff) | |
| parent | d08b21016466561db7a17e44e29d1d7413d79265 (diff) | |
| download | cpython-1df37c657d7b32cfc7e765f13323415ef1c5be31.zip cpython-1df37c657d7b32cfc7e765f13323415ef1c5be31.tar.gz cpython-1df37c657d7b32cfc7e765f13323415ef1c5be31.tar.bz2 | |
#17833: merge with 3.3
| -rw-r--r-- | Misc/NEWS | 3 | ||||
| -rw-r--r-- | Tools/gdb/libpython.py | 2 |
2 files changed, 4 insertions, 1 deletions
@@ -215,6 +215,9 @@ Library 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 index 20dcda8..ef69359 100644 --- a/Tools/gdb/libpython.py +++ b/Tools/gdb/libpython.py @@ -1462,7 +1462,7 @@ class Frame(object): # 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?''' |