python compat - iterator protocol

[michaelplatings]

utils/gdb-scripts/prettyprinters.py

73

I think this needs an associated

if sys.version_info.major == 2:
    next == __next__

172

I think this needs an associated

if sys.version_info.major == 2:
    next == __next__

[michaelplatings]

bindings/python/llvm/core.py

403

== should be =

utils/gdb-scripts/prettyprinters.py

84

Should be next = __next__
Or don't make this change at all as the code should already work with Python 3.

90

This line is just wrong in the original. It creates a variable __next__ that is set to the built in next function. It serves no use and should be deleted.

175

I see at line 183:
__next__ = next
which would be broken by this change. I suggest not making this change as the code should already work for Python 3.

[serge-sans-paille]

utils/gdb-scripts/prettyprinters.py

84

I made the move to make it clear that python3 should be the default standard, and the ugly boilerplate is the python2 compatibility.

90

Correct! I've been in auto-fix mode for some of these commits, thanks *a lot* for spotting all these mistakes.

175

For the reasons given above, I still made the change, and fixed the behavior below. I also checked the other next implementation.

[michaelplatings]

utils/gdb-scripts/prettyprinters.py

185

makor -> major

[michaelplatings]

bindings/python/llvm/core.py

248

I had a poke around this file and found that self.function.next refers to the next property in the Function class. I don't think the Function class should be changed as it isn't intended to be an iterator, and therefore the change to this line should be reverted.

319

Likewise, self.bb.next is a property of BasicBlock.
The change to this line should be reverted.

399

Likewise, self.inst.next is a property of Instruction.
The change to this line should be reverted.

bindings/python/llvm/tests/test_core.py

101

I think this refers to the next property of the Function class in core.py. The change on this line should be reverted.

[michaelplatings]

LGTM

bindings/python/llvm/core.py

 from ctypes import c_char_p
 from ctypes import c_uint
 
+import sys
+
 __all__ = [
     "lib",
     "Enums",

         def __iter__(self):
             return self
         
-        def next(self):
+        def __next__(self):
             if not isinstance(self.function, Function):
                 raise StopIteration("")
             result = self.function
             if self.reverse:
                 self.function = self.function.prev
             else:
-                self.function = self.function.next
+                self.function = self.function.__next__
             return result
-    
+        if sys.version_info.major == 2:
+            next = __next__
+
     def __iter__(self):
         return Module.__function_iterator(self)
 

         def __iter__(self):
             return self
         
-        def next(self):
+        def __next__(self):
             if not isinstance(self.bb, BasicBlock):
                 raise StopIteration("")
             result = self.bb
             if self.reverse:
                 self.bb = self.bb.prev
             else:
-                self.bb = self.bb.next
+                self.bb = self.bb.__next__
             return result
+
+        if sys.version_info.major == 2:
+            next = __next__
     
     def __iter__(self):
         return Function.__bb_iterator(self)

         def __iter__(self):
             return self
         
-        def next(self):
+        def __next__(self):
             if not isinstance(self.inst, Instruction):
                 raise StopIteration("")
             result = self.inst
             if self.reverse:
                 self.inst = self.inst.prev
             else:
-                self.inst = self.inst.next
+                self.inst = self.inst.__next__
             return result
-    
+        if sys.version_info.major == 2:
+            next = __next__
+
     def __iter__(self):
         return BasicBlock.__inst_iterator(self)
 

bindings/python/llvm/tests/test_core.py

 
         f = m.first
         while f.name != "f6":
-            f = f.next
+            f = f.__next__
 
         # Forward
         for bb in f:

utils/gdb-scripts/prettyprinters.py

 from __future__ import print_function
+import sys
 
 import gdb.printing
 

   def __iter__(self):
     return self
 
-  # Python 2 compatibility
+  if sys.version_info.major == 2:
       def next(self):
         return self.__next__()
 
   def children(self):
     return self

     def __iter__(self):
       return self
 
-    def next(self):
+    def __next__(self):
       if self.cur == self.end:
         raise StopIteration
       count = self.count

       self.cur = self.cur + 1
       return '[%d]' % count, cur.dereference()
 
-    __next__ = next
+    if sys.version_info.major == 2:
+        next = __next__
 
   def __init__(self, val):
     self.val = val
 
-    __next__ = next
-
   def children(self):
     data = self.val['Data']
     return self._iterator(data, data + self.val['Length'])

       while self.cur != self.end and (is_equal(self.cur.dereference()['first'], empty) or is_equal(self.cur.dereference()['first'], tombstone)):
         self.cur = self.cur + 1
 
-    def next(self):
+    def __next__(self):
       if self.cur == self.end:
         raise StopIteration
       cur = self.cur

         self.first = False
       return 'x', v
 
-    __next__ = next
+    if sys.version_info.makor == 2:
+        next = __next__
 
   def __init__(self, val):
     self.val = val