diff options
| author | Nikolaus Schlemm | 2013-05-18 17:13:59 +0200 |
|---|---|---|
| committer | Nikolaus Schlemm | 2013-05-18 17:13:59 +0200 |
| commit | b225b1d5c9cd8e2bec289f5da795637385b2cbe6 (patch) | |
| tree | fca92570fd7a056ed150b188c552d01d4c27dea5 /rest_framework/fields.py | |
| parent | a42afa04c38afe25c9032b8ce37b572678b02cf1 (diff) | |
| parent | 3f47eb7a77fcc735782dd1bf8e8e053e26417ea1 (diff) | |
| download | django-rest-framework-b225b1d5c9cd8e2bec289f5da795637385b2cbe6.tar.bz2 | |
Merge branch 'master' of git://github.com/tomchristie/django-rest-framework into issue-192-expose-fields-for-options
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 491aa7ed..fc14184c 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -383,7 +383,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) @@ -392,7 +391,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) |