diff options
| author | Ryan Kaskel | 2013-05-18 16:26:17 +0100 | 
|---|---|---|
| committer | Ryan Kaskel | 2013-05-18 16:26:17 +0100 | 
| commit | 33f702d306093126b9b033bb2be0cf9391629c6b (patch) | |
| tree | 4b66faa5f6219fd9409bb0e6518f9d90172276ea /rest_framework/fields.py | |
| parent | 10e451a85a034d1158148f54e98147e81454c2ed (diff) | |
| parent | 3f47eb7a77fcc735782dd1bf8e8e053e26417ea1 (diff) | |
| download | django-rest-framework-33f702d306093126b9b033bb2be0cf9391629c6b.tar.bz2 | |
Merge latest changes from master.
Diffstat (limited to 'rest_framework/fields.py')
| -rw-r--r-- | rest_framework/fields.py | 2 | 
1 files changed, 0 insertions, 2 deletions
| diff --git a/rest_framework/fields.py b/rest_framework/fields.py index c3ac6281..d5cf30e4 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -394,7 +394,6 @@ class URLField(CharField):      type_name = 'URLField'      def __init__(self, **kwargs): -        kwargs['max_length'] = kwargs.get('max_length', 200)          kwargs['validators'] = [validators.URLValidator()]          super(URLField, self).__init__(**kwargs) @@ -403,7 +402,6 @@ class SlugField(CharField):      type_name = 'SlugField'      def __init__(self, *args, **kwargs): -        kwargs['max_length'] = kwargs.get('max_length', 50)          super(SlugField, self).__init__(*args, **kwargs) | 
