Merge branch 'master' of git://github.com/lapilofu/philo into develop

[philo.git] / philo / forms / fields.py

diff --git a/philo/forms/fields.py b/philo/forms/fields.py
index b148947..66b96ad 100644 (file)
--- a/philo/forms/fields.py
+++ b/philo/forms/fields.py
@@ -1,6 +1,7 @@
 from django import forms
 from django.core.exceptions import ValidationError
 from django.utils import simplejson as json
 from django import forms
 from django.core.exceptions import ValidationError
 from django.utils import simplejson as json

+

 from philo.validators import json_validator
 
 
 from philo.validators import json_validator
 
 


@@ -8,6 +9,7 @@ __all__ = ('JSONFormField',)
 
 
 class JSONFormField(forms.Field):
 
 
 class JSONFormField(forms.Field):

+       """A form field which is validated by :func:`philo.validators.json_validator`."""

        default_validators = [json_validator]
        
        def clean(self, value):
        default_validators = [json_validator]
        
        def clean(self, value):