django/django — pull request #2990 by areski (2014-07-27 21:41:57+00:00)
Title: fixed #23112 -- Field.get_choices tries to index an iterable

related to https://code.djangoproject.com/ticket/23112