tomchristie/django-rest-framework — pull request #364 by mjs7231 (2012-11-04 17:34:26+00:00)
Title: Fix for bug #363: ChoiceField missing in renderers.py

Two minor changes:

1. Added ChoiceField in the field_mapping selection if the serializer explicitly asks for a ChoiceField.
2. Check for the choices kwarg before assuming CharField when no mapping is found.