Let ChoiceField.__init__ take callable choices

The code comes from https://code.djangoproject.com/attachment/ticket/13181/with_callable_choice_iterator.diff by vanschelven.

This addresses https://code.djangoproject.com/ticket/13181.
Can you fix the indention here. 4 Spaces are correct, iirc