Merge branch 'issue-192-expose-fields-for-options' of git://github.com/grimborg/django-rest-framework into issue-192-expose-fields-for-options

Conflicts:
	rest_framework/tests/fields.py

1 files changed, 2 insertions, 0 deletions

diff --git a/rest_framework/views.py b/rest_framework/views.py
index c5b89a02..11d50e5d 100644
--- a/rest_framework/views.py
+++ b/rest_framework/views.py
@@ -84,6 +84,8 @@ class APIView(View):
                 if serializer is not None:
                     field_name_types = {}
                     for name, field in serializer.fields.iteritems():
+                        from rest_framework.fields import humanize_field
+                        humanize_field(field)
                         field_name_types[name] = field.__class__.__name__
 
                 actions[method] = field_name_types