comparison mercurial/revset.py @ 29215:f5983805574e

revset: rename variable to avoid shadowing with builtin next() function

https://docs.python.org/2/library/functions.html#next

29214:ceca932c080d

        while True:
            if val1 is None:
                val1 = iter1.next()
            if val2 is None:
                val2 = iter2.next()
            next = choice(val1, val2)
            yield next
            if val1 == next:
                val1 = None
            if val2 == next:
                val2 = None
    except StopIteration:
        # Flush any remaining values and consume the other one
        it = iter2
        if val1 is not None:

29215:f5983805574e

        while True:
            if val1 is None:
                val1 = iter1.next()
            if val2 is None:
                val2 = iter2.next()
            n = choice(val1, val2)
            yield n
            if val1 == n:
                val1 = None
            if val2 == n:
                val2 = None
    except StopIteration:
        # Flush any remaining values and consume the other one
        it = iter2
        if val1 is not None: