Commits

Matthew Schinckel committed c57c9a5

Resolves #16: Unnecessary if None check.

Comments (0)

Files changed (1)

jsonfield/fields.py

 from forms import JSONFormField
 
 def default(o):
+    if hasattr(o, 'to_json'):
+        return o.to_json()
     if isinstance(o, Decimal):
         return str(o)
     if isinstance(o, datetime.datetime):
 
     def to_python(self, value):
         if isinstance(value, basestring):
-            if value is None:
-                return None
             if value == "":
                 if self.null:
                     return None