[Lldb-commits] [lldb] r257829 - Fix detection of teardown hooks that are already bound.

[Adrian McCarthy via lldb-commits]

Author: amccarth
Date: Thu Jan 14 16:52:16 2016
New Revision: 257829

URL: http://llvm.org/viewvc/llvm-project?rev=257829&view=rev
Log:
Fix detection of teardown hooks that are already bound.

Modified:
    lldb/trunk/packages/Python/lldbsuite/test/lldbtest.py

Modified: lldb/trunk/packages/Python/lldbsuite/test/lldbtest.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lldbtest.py?rev=257829&r1=257828&r2=257829&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/lldbtest.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/lldbtest.py Thu Jan 14 16:52:16 2016
@@ -1647,7 +1647,7 @@ class Base(unittest2.TestCase):
                 print("Executing tearDown hook:", getsource_if_available(hook), file=sbuf)
             import inspect
             hook_argc = len(inspect.getargspec(hook).args)
-            if hook_argc == 0 or getattr(hook,'im_self',None):
+            if hook_argc == 0 or (getattr(hook,'im_self',None) is not None) or (hasattr(hook, '__self__')):
                 hook()
             elif hook_argc == 1:
                 hook(self)