diff options
| author | Zachary Turner <zturner@google.com> | 2016-02-09 21:36:38 +0000 |
|---|---|---|
| committer | Zachary Turner <zturner@google.com> | 2016-02-09 21:36:38 +0000 |
| commit | 81d0804d96904148b9f16a4ae4be07fd89b01c4a (patch) | |
| tree | 903b8c6e9ed94535f7571fca1fb105f994d19c38 | |
| parent | 9625c6fc9ff831376cd4d022a7b1c6c0075d9230 (diff) | |
| download | bcm5719-llvm-81d0804d96904148b9f16a4ae4be07fd89b01c4a.tar.gz bcm5719-llvm-81d0804d96904148b9f16a4ae4be07fd89b01c4a.zip | |
Fix incorrect usage of `str` in _match_decorator_property.
llvm-svn: 260292
| -rw-r--r-- | lldb/packages/Python/lldbsuite/test/decorators.py | 2 |
1 files changed, 1 insertions, 1 deletions
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]) |
