Matthew Schinckel avatar 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
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.