From 81d0804d96904148b9f16a4ae4be07fd89b01c4a Mon Sep 17 00:00:00 2001 From: Zachary Turner Date: Tue, 9 Feb 2016 21:36:38 +0000 Subject: Fix incorrect usage of `str` in _match_decorator_property. llvm-svn: 260292 --- lldb/packages/Python/lldbsuite/test/decorators.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lldb/packages/Python') diff --git a/lldb/packages/Python/lldbsuite/test/decorators.py b/lldb/packages/Python/lldbsuite/test/decorators.py index 924c0cb1df7..b42487a1707 100644 --- a/lldb/packages/Python/lldbsuite/test/decorators.py +++ b/lldb/packages/Python/lldbsuite/test/decorators.py @@ -62,7 +62,7 @@ def _match_decorator_property(expected, actual): 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]) -- cgit v1.2.3