diff options
| author | Michal Dvorak (cen38289) | 2012-12-17 16:35:47 +0100 |
|---|---|---|
| committer | Michal Dvorak (cen38289) | 2012-12-17 17:01:00 +0100 |
| commit | 8ac77eaae8d6ad01ec8f6de18134c4aa1961d4dd (patch) | |
| tree | dbdfdf8d3bdb5fd255ff0c9ce7bad75f34b48b19 /rest_framework/renderers.py | |
| parent | 2a82b64963792b353a7a2634c003692bd4957c9f (diff) | |
| parent | 70714c234630cd205ed88686ece3b594f387a48f (diff) | |
| download | django-rest-framework-8ac77eaae8d6ad01ec8f6de18134c4aa1961d4dd.tar.bz2 | |
Merge remote-tracking branch 'tom/master'
Conflicts:
rest_framework/serializers.py
rest_framework/tests/serializer.py
Diffstat (limited to 'rest_framework/renderers.py')
| -rw-r--r-- | rest_framework/renderers.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py index 25a32baa..1220bca1 100644 --- a/rest_framework/renderers.py +++ b/rest_framework/renderers.py @@ -320,6 +320,9 @@ class BrowsableAPIRenderer(BaseRenderer): if getattr(v, 'choices', None) is not None: kwargs['choices'] = v.choices + if getattr(v, 'regex', None) is not None: + kwargs['regex'] = v.regex + if getattr(v, 'widget', None): widget = copy.deepcopy(v.widget) kwargs['widget'] = widget |