Author: zturner
Date: Tue Feb 9 15:36:38 2016
New Revision: 260292
URL: http://llvm.org/viewvc/llvm-project?rev=260292&view=rev
Log:
Fix incorrect usage of `str` in _match_decorator_property.
Modified:
lldb/trunk/packages/Python/lldbsuite/test/decorators.py
Modified: lldb/trunk/packages/Python/lldbsuite/test/decorators.py
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/decorators.py?rev=260292&r1=260291&r2=260292&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/decorators.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/decorators.py Tue Feb 9 15:36:38
2016
@@ -62,7 +62,7 @@ def _match_decorator_property(expected,
if isinstance(expected, no_match):
return not _match_decorator_property(expected.item, actual)
- elif isinstance(expected, (str, re._pattern_type)):
+ elif isinstance(expected, (re._pattern_type,)+six.string_types):
return re.search(expected, actual) is not None
elif hasattr(expected, "__iter__"):
return any([x is not None and _match_decorator_property(x, actual) for
x in expected])
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
