Merge 89a8864 into a411897

rackerlabs · Apr 10, 2015 · 61c74fe · 61c74fe
2 parents a411897 + 89a8864
commit 61c74fe
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/silverberg/marshal.py b/silverberg/marshal.py
@@ -76,6 +76,8 @@ def marshal(term):
         # If the datetime is naive, then it is considered UTC time and stored. If it is
         # timezone-aware, then its corresponding UTC time is stored
         return str(int(calendar.timegm(term.utctimetuple()) * 1000 + term.microsecond / 1e3))
+    elif term is None:
+        return "null"
     else:
         return str(term)