Make every Python API __len__() method return a PyIntObject.

swig 2.0+ seems to default to using PyLongObjects, but the __len__()
method _must_ return a PyIntObject.

llvm-svn: 156639

9 files changed, 12 insertions, 11 deletions

diff --git a/lldb/scripts/Python/interface/SBBlock.i b/lldb/scripts/Python/interface/SBBlock.i
index cdaf62cbeca..c8435df4890 100644
--- a/lldb/scripts/Python/interface/SBBlock.i
+++ b/lldb/scripts/Python/interface/SBBlock.i
@@ -116,7 +116,7 @@ public:
         
             def __len__(self):
                 if self.sbblock:
-                    return self.sbblock.GetNumRanges()
+                    return int(self.sbblock.GetNumRanges())
                 return 0
         
             def __getitem__(self, key):
diff --git a/lldb/scripts/Python/interface/SBData.i b/lldb/scripts/Python/interface/SBData.i
index f90dd3e1ba2..6ca8f0b6a95 100644
--- a/lldb/scripts/Python/interface/SBData.i
+++ b/lldb/scripts/Python/interface/SBData.i
@@ -156,7 +156,7 @@ public:
                 else:
                     return my_data
             def __len__(self):
-                return self.sbdata.GetByteSize()/self.item_size
+                return int(self.sbdata.GetByteSize()/self.item_size)
             def all(self):
                 return self[0:len(self)]
         
diff --git a/lldb/scripts/Python/interface/SBInstructionList.i b/lldb/scripts/Python/interface/SBInstructionList.i
index b2bb3496e34..9f4a1b0bd9d 100644
--- a/lldb/scripts/Python/interface/SBInstructionList.i
+++ b/lldb/scripts/Python/interface/SBInstructionList.i
@@ -62,7 +62,7 @@ public:
     %pythoncode %{
         def __len__(self):
             '''Access len of the instruction list.'''
-            return self.GetSize();
+            return int(self.GetSize())
 
         def __getitem__(self, key):
             '''Access instructions by integer index.'''
diff --git a/lldb/scripts/Python/interface/SBModule.i b/lldb/scripts/Python/interface/SBModule.i
index 1b6d4ecac43..fbc0b7b6fc5 100644
--- a/lldb/scripts/Python/interface/SBModule.i
+++ b/lldb/scripts/Python/interface/SBModule.i
@@ -259,7 +259,7 @@ public:
         
             def __len__(self):
                 if self.sbmodule:
-                    return self.sbmodule.GetNumSymbols()
+                    return int(self.sbmodule.GetNumSymbols())
                 return 0
         
             def __getitem__(self, key):
@@ -315,7 +315,7 @@ public:
         
             def __len__(self):
                 if self.sbmodule:
-                    return self.sbmodule.GetNumSections()
+                    return int(self.sbmodule.GetNumSections())
                 return 0
         
             def __getitem__(self, key):
diff --git a/lldb/scripts/Python/interface/SBProcess.i b/lldb/scripts/Python/interface/SBProcess.i
index 37100557f9c..2069adf2de0 100644
--- a/lldb/scripts/Python/interface/SBProcess.i
+++ b/lldb/scripts/Python/interface/SBProcess.i
@@ -321,7 +321,8 @@ public:
                 self.sbprocess = sbprocess
         
             def __len__(self):
-                if self.sbprocess: return self.sbprocess.GetNumThreads()
+                if self.sbprocess:
+                    return int(self.sbprocess.GetNumThreads())
                 return 0
         
             def __getitem__(self, key):
diff --git a/lldb/scripts/Python/interface/SBSymbolContextList.i b/lldb/scripts/Python/interface/SBSymbolContextList.i
index 0a03a22d4ab..08dcf1e2cf5 100644
--- a/lldb/scripts/Python/interface/SBSymbolContextList.i
+++ b/lldb/scripts/Python/interface/SBSymbolContextList.i
@@ -62,7 +62,7 @@ public:
     
     %pythoncode %{
         def __len__(self):
-            return self.GetSize()
+            return int(self.GetSize())
 
         def __getitem__(self, key):
             count = len(self)
diff --git a/lldb/scripts/Python/interface/SBTarget.i b/lldb/scripts/Python/interface/SBTarget.i
index 23a9ba152ba..e8b6a00bdb8 100644
--- a/lldb/scripts/Python/interface/SBTarget.i
+++ b/lldb/scripts/Python/interface/SBTarget.i
@@ -691,7 +691,7 @@ public:
         
             def __len__(self):
                 if self.sbtarget:
-                    return self.sbtarget.GetNumModules()
+                    return int(self.sbtarget.GetNumModules())
                 return 0
         
             def __getitem__(self, key):
diff --git a/lldb/scripts/Python/interface/SBThread.i b/lldb/scripts/Python/interface/SBThread.i
index 93fd7f98e1e..295a775f060 100644
--- a/lldb/scripts/Python/interface/SBThread.i
+++ b/lldb/scripts/Python/interface/SBThread.i
@@ -182,7 +182,7 @@ public:
 
             def __len__(self):
                 if self.sbthread:
-                    return self.sbthread.GetNumFrames()
+                    return int(self.sbthread.GetNumFrames())
                 return 0
             
             def __getitem__(self, key):
diff --git a/lldb/scripts/Python/interface/SBValueList.i b/lldb/scripts/Python/interface/SBValueList.i
index 1bc904980ef..a55345030c0 100644
--- a/lldb/scripts/Python/interface/SBValueList.i
+++ b/lldb/scripts/Python/interface/SBValueList.i
@@ -98,8 +98,8 @@ public:
     FindValueObjectByUID (lldb::user_id_t uid);
     %pythoncode %{
         def __len__(self):
-            return self.GetSize()
-        
+            return int(self.GetSize())
+
         def __getitem__(self, key):
             count = len(self)
             #------------------------------------------------------------