diff options
| author | Xavier Ordoquy | 2013-01-02 16:09:21 +0100 | 
|---|---|---|
| committer | Xavier Ordoquy | 2013-01-02 16:09:21 +0100 | 
| commit | 737349d2389197d23886b72c1cb44f53c501ac9a (patch) | |
| tree | 0c542b6c73deee0280705c8253334126c5f5d254 /rest_framework/renderers.py | |
| parent | 5fad46d7e213afed503b1533515cab96875a5936 (diff) | |
| parent | d379997aba5b1e41309bbed8740ed704c0feb58b (diff) | |
| download | django-rest-framework-737349d2389197d23886b72c1cb44f53c501ac9a.tar.bz2 | |
Merge remote-tracking branch 'reference/py3k' into p3k
Diffstat (limited to 'rest_framework/renderers.py')
| -rw-r--r-- | rest_framework/renderers.py | 5 | 
1 files changed, 4 insertions, 1 deletions
diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py index 44a40baf..54930167 100644 --- a/rest_framework/renderers.py +++ b/rest_framework/renderers.py @@ -22,7 +22,7 @@ from rest_framework.utils import dict2xml  from rest_framework.utils import encoders  from rest_framework.utils.breadcrumbs import get_breadcrumbs  from rest_framework import VERSION, status -from rest_framework import serializers, parsers +from rest_framework import parsers  class BaseRenderer(object): @@ -322,6 +322,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  | 
