summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZachary Turner <zturner@google.com>2015-11-11 17:59:57 +0000
committerZachary Turner <zturner@google.com>2015-11-11 17:59:57 +0000
commitd4870df9bf3ba1428eefda3a41d77ea684f278eb (patch)
tree0a150d517e6c6cb4737e01f92c2d02d9caabbaa9
parenta52b4da0395255406c1d40a2fc203555bfd06ac1 (diff)
downloadbcm5719-llvm-d4870df9bf3ba1428eefda3a41d77ea684f278eb.tar.gz
bcm5719-llvm-d4870df9bf3ba1428eefda3a41d77ea684f278eb.zip
Python 3 - Use six in our embedded Python glue code.
llvm-svn: 252767
-rw-r--r--lldb/scripts/interface/SBData.i2
-rw-r--r--lldb/scripts/lldb.swig2
2 files changed, 3 insertions, 1 deletions
diff --git a/lldb/scripts/interface/SBData.i b/lldb/scripts/interface/SBData.i
index 5f22bd81b23..41aaf8dbded 100644
--- a/lldb/scripts/interface/SBData.i
+++ b/lldb/scripts/interface/SBData.i
@@ -146,7 +146,7 @@ public:
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()
diff --git a/lldb/scripts/lldb.swig b/lldb/scripts/lldb.swig
index 1493022457a..99db6faca61 100644
--- a/lldb/scripts/lldb.swig
+++ b/lldb/scripts/lldb.swig
@@ -41,6 +41,8 @@ o SBLineEntry: Specifies an association with a contiguous range of instructions
import uuid
import re
import os
+
+import six
%}
%include "./Python/python-typemaps.swig"
OpenPOWER on IntegriCloud