#17833: merge with 3.3

This commit is contained in:
David Malcolm 2013-05-06 14:51:13 -04:00
commit 1df37c657d
2 changed files with 4 additions and 1 deletions

View File

@ -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.

View File

@ -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?'''