Ezio's patch looks fine to me, though as Meador points out in the Rietveld review, there are a couple of omissions that could be fixed.

Personally, I'm not so convinced of the value of upgrading all the existing uses of splitlines to use 'keepends';  I just wanted to be able to do this in *new* code. :-)  I guess I'm +0 on the int -> bool changes (replacing .splitlines(1) with .splitlines(True)), and -0 on adding the extra 'splitlines' keywords throughout existing source.