A general piece of advice, don't change various preferences (whitespace, import styles) within the same commit, especially when introducing large changes.  It clutters the diff, making it hard to merge. What's done here is also standard Django forms usage so I don't see a reason why is is needed, or how it improves clarity, but now I'll basically have to go with it in order to merge stuff. :) Same goes for Django core btw, simple changes get merged faster.