diff options
| author | Mark Aaron Shirley | 2012-11-21 09:37:22 -0800 |
|---|---|---|
| committer | Mark Aaron Shirley | 2012-11-21 09:37:22 -0800 |
| commit | 0876bed96304c3c2125e0de67736d40bfe921cf7 (patch) | |
| tree | 4ba4c0cceea3ca001665560619313aed1c9624b8 /rest_framework/renderers.py | |
| parent | 1adfc41dc7c7e50edbf72f87ebf62bae33eb212c (diff) | |
| parent | b0bad35ef0972ec26ff808d81b1f43f16683898d (diff) | |
| download | django-rest-framework-0876bed96304c3c2125e0de67736d40bfe921cf7.tar.bz2 | |
Merge remote-tracking branch 'upstream/master' into partial-update
Diffstat (limited to 'rest_framework/renderers.py')
| -rw-r--r-- | rest_framework/renderers.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py index db1bce39..550963cb 100644 --- a/rest_framework/renderers.py +++ b/rest_framework/renderers.py @@ -312,6 +312,7 @@ class BrowsableAPIRenderer(BaseRenderer): serializers.DateTimeField: forms.DateTimeField, serializers.DateField: forms.DateField, serializers.EmailField: forms.EmailField, + serializers.RegexField: forms.RegexField, serializers.CharField: forms.CharField, serializers.ChoiceField: forms.ChoiceField, serializers.BooleanField: forms.BooleanField, @@ -326,7 +327,7 @@ class BrowsableAPIRenderer(BaseRenderer): } fields = {} - for k, v in serializer.get_fields(True).items(): + for k, v in serializer.get_fields().items(): if getattr(v, 'read_only', True): continue |