##// END OF EJS Templates
revset: rename variable to avoid shadowing with builtin next() function...
timeless -
r29215:f5983805 default
parent child Browse files
Show More
@@ -2824,11 +2824,11 def _iterordered(ascending, iter1, iter2
2824 val1 = iter1.next()
2824 val1 = iter1.next()
2825 if val2 is None:
2825 if val2 is None:
2826 val2 = iter2.next()
2826 val2 = iter2.next()
2827 next = choice(val1, val2)
2827 n = choice(val1, val2)
2828 yield next
2828 yield n
2829 if val1 == next:
2829 if val1 == n:
2830 val1 = None
2830 val1 = None
2831 if val2 == next:
2831 if val2 == n:
2832 val2 = None
2832 val2 = None
2833 except StopIteration:
2833 except StopIteration:
2834 # Flush any remaining values and consume the other one
2834 # Flush any remaining values and consume the other one
General Comments 0
You need to be logged in to leave comments. Login now