I had to make two patches because the testing style has changed slightly between the two, but also, it's guaranteed to apply better if I make them against the tip of each version.
def line_number_mogrifier(f):
num = 0
for line in f:
yield (num, line)
num += 1