From e89a66bd4a30a9c421405f56aa93ce6818fdddc7 Mon Sep 17 00:00:00 2001 From: Zachary Turner Date: Wed, 27 Jan 2016 18:49:35 +0000 Subject: Fix some python 3 incompatibilities that went in overnight. * basestring is not a thing anymore. Must use `six.string_types`. * Must use from __future__ import print_function in every new test file. llvm-svn: 258967 --- lldb/packages/Python/lldbsuite/test/lldbtest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lldb/packages/Python/lldbsuite/test/lldbtest.py') diff --git a/lldb/packages/Python/lldbsuite/test/lldbtest.py b/lldb/packages/Python/lldbsuite/test/lldbtest.py index 0baad8aa7fd..61355a86129 100644 --- a/lldb/packages/Python/lldbsuite/test/lldbtest.py +++ b/lldb/packages/Python/lldbsuite/test/lldbtest.py @@ -646,7 +646,7 @@ def check_list_or_lambda(list_or_lambda, value): def matchArchitectures(archs, actual_arch): retype = type(re.compile('hello, world')) list_passes = isinstance(archs, list) and actual_arch in archs - basestring_passes = isinstance(archs, basestring) and actual_arch == archs + basestring_passes = isinstance(archs, six.string_types) and actual_arch == archs regex_passes = isinstance(archs, retype) and re.match(archs, actual_arch) return (list_passes or basestring_passes or regex_passes) -- cgit v1.2.3