diff options
| author | Xavier Ordoquy | 2014-02-18 11:42:35 +0100 |
|---|---|---|
| committer | Xavier Ordoquy | 2014-02-18 11:42:35 +0100 |
| commit | b2f0f4fcf49d457aefc21960f62fcb8f2cf6770d (patch) | |
| tree | 9adabfaa8c2a73e9b1304f8d699a3f70f284634a /rest_framework/fields.py | |
| parent | 5ae94547bc08ade94c3f1df2223c0b8261cae59f (diff) | |
| parent | 822eb39599b248c68573c3095639a831ab6df99a (diff) | |
| download | django-rest-framework-b2f0f4fcf49d457aefc21960f62fcb8f2cf6770d.tar.bz2 | |
Merge remote-tracking branch 'reference/master' into feature/django_1_7
Diffstat (limited to 'rest_framework/fields.py')
| -rw-r--r-- | rest_framework/fields.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 2f475d6e..05daaab7 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -477,7 +477,8 @@ class URLField(CharField): type_label = 'url' def __init__(self, **kwargs): - kwargs['validators'] = [validators.URLValidator()] + if not 'validators' in kwargs: + kwargs['validators'] = [validators.URLValidator()] super(URLField, self).__init__(**kwargs) |