CLN refactor from_diff and py26 compat