Commit 3b6b0a8d authored by Hans Wennborg's avatar Hans Wennborg
Browse files

Merging r258967: 

------------------------------------------------------------------------
r258967 | zturner | 2016-01-27 10:49:35 -0800 (Wed, 27 Jan 2016) | 5 lines

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: 259524
parent 0b9e6e52

lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_in_delayslot/TestAvoidBreakpointInDelaySlot.py

+3 −1
Original line number Diff line number Diff line
@@ -2,6 +2,8 @@ 
Test specific to MIPS 

"""



from __future__ import print_function



import os, time

import re

import unittest2
@@ -45,7 +47,7 @@ class AvoidBreakpointInDelaySlotAPITestCase(TestBase): 
        """Iterate over instructions in function and place a breakpoint on delay slot instruction"""

        # Get the list of all instructions in the function

        insts = function.GetInstructions(target)

        print insts

        print(insts)

        i = 0

        for inst in insts:

            if (inst.HasDelaySlot()):

lldb/packages/Python/lldbsuite/test/lldbtest.py

+1 −1
Original line number Diff line number Diff line
@@ -636,7 +636,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)