[llvm-branch-commits] [lldb] r259524 - Merging r258967:

[Hans Wennborg via llvm-branch-commits]

Author: hans
Date: Tue Feb  2 10:50:06 2016
New Revision: 259524

URL: http://llvm.org/viewvc/llvm-project?rev=259524&view=rev
Log:
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.
------------------------------------------------------------------------

Modified:
    lldb/branches/release_38/   (props changed)
    lldb/branches/release_38/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_in_delayslot/TestAvoidBreakpointInDelaySlot.py
    lldb/branches/release_38/packages/Python/lldbsuite/test/lldbtest.py

Propchange: lldb/branches/release_38/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb  2 10:50:06 2016
@@ -1,3 +1,3 @@
 /lldb/branches/apple/python-GIL:156467-162159
 /lldb/branches/iohandler:198360-200250
-/lldb/trunk:257691-257692,257926,258621,258684-258685,258758,258761,258919,259188
+/lldb/trunk:257691-257692,257926,258621,258684-258685,258758,258761,258919,258967,259188

Modified: lldb/branches/release_38/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_in_delayslot/TestAvoidBreakpointInDelaySlot.py
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/release_38/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_in_delayslot/TestAvoidBreakpointInDelaySlot.py?rev=259524&r1=259523&r2=259524&view=diff
==============================================================================
--- lldb/branches/release_38/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_in_delayslot/TestAvoidBreakpointInDelaySlot.py (original)
+++ lldb/branches/release_38/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_in_delayslot/TestAvoidBreakpointInDelaySlot.py Tue Feb  2 10:50:06 2016
@@ -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 AvoidBreakpointInDelaySlotAPITestC
         """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()):

Modified: lldb/branches/release_38/packages/Python/lldbsuite/test/lldbtest.py
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/release_38/packages/Python/lldbsuite/test/lldbtest.py?rev=259524&r1=259523&r2=259524&view=diff
==============================================================================
--- lldb/branches/release_38/packages/Python/lldbsuite/test/lldbtest.py (original)
+++ lldb/branches/release_38/packages/Python/lldbsuite/test/lldbtest.py Tue Feb  2 10:50:06 2016
@@ -636,7 +636,7 @@ def check_list_or_lambda(list_or_lambda,
 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)