First pass on incorperating the form rendering into the browsable API

1 files changed, 8 insertions, 1 deletions

diff --git a/rest_framework/utils/field_mapping.py b/rest_framework/utils/field_mapping.py
index b4d33e39..30fae370 100644
--- a/rest_framework/utils/field_mapping.py
+++ b/rest_framework/utils/field_mapping.py
@@ -21,7 +21,14 @@ class ClassLookupDict(object):
         self.mapping = mapping
 
     def __getitem__(self, key):
-        for cls in inspect.getmro(key.__class__):
+        if hasattr(key, '_proxy_class'):
+            # Deal with proxy classes. Ie. BoundField behaves as if it
+            # is a Field instance when using ClassLookupDict.
+            base_class = key._proxy_class
+        else:
+            base_class = key.__class__
+
+        for cls in inspect.getmro(base_class):
             if cls in self.mapping:
                 return self.mapping[cls]
         raise KeyError('Class %s not found in lookup.', cls.__name__)