commit d4870df9bf3ba1428eefda3a41d77ea684f278eb
author Zachary Turner <zturner@google.com> Wed Nov 11 17:59:57 2015 +0000
committer Zachary Turner <zturner@google.com> Wed Nov 11 17:59:57 2015 +0000
tree 0a150d517e6c6cb4737e01f92c2d02d9caabbaa9
parent a52b4da0395255406c1d40a2fc203555bfd06ac1

Python 3 - Use six in our embedded Python glue code.

llvm-svn: 252767

lldb/scripts/interface/SBData.i

diff --git a/lldb/scripts/interface/SBData.i b/lldb/scripts/interface/SBData.i
index 5f22bd8..41aaf8d 100644
--- a/lldb/scripts/interface/SBData.i
+++ b/lldb/scripts/interface/SBData.i
@@ -146,7 +146,7 @@
                     for x in range(*key.indices(self.__len__())):
                         list.append(self.__getitem__(x))
                     return list
-                if not (isinstance(key,(int,long))):
+                if not (isinstance(key,six.integer_types)):
                     raise TypeError('must be int')
                 key = key * self.item_size # SBData uses byte-based indexes, but we want to use itemsize-based indexes here
                 error = SBError()

lldb/scripts/lldb.swig

diff --git a/lldb/scripts/lldb.swig b/lldb/scripts/lldb.swig
index 1493022..99db6fa 100644
--- a/lldb/scripts/lldb.swig
+++ b/lldb/scripts/lldb.swig
@@ -41,6 +41,8 @@
 import uuid
 import re
 import os
+
+import six
 %}
 %include "./Python/python-typemaps.swig"