Aaron Bentley has voted +1. Status is now: Semi-approved Comment: For a bugfix, this looks fine. Long-term, we should probably remove iter_file_patch, because it can't be implemented without pre-parsing the patch. For details, see: http://bundlebuggy.aaronbentley.com/request/%3C45EC26DB.1070805%40lysator.liu.se%3E