1 files changed, 14 insertions, 4 deletions

diff --git a/pandora/models/__init__.py b/pandora/models/__init__.py
index 7a60889..bafb6ce 100644
--- a/pandora/models/__init__.py
+++ b/pandora/models/__init__.py
@@ -57,6 +57,20 @@ class SyntheticField(namedtuple("SyntheticField", ["field"])):
         raise NotImplementedError
 
 
+class DateField(SyntheticField):
+    """Date Field
+
+    Handles a JSON map that contains a time field which is the timestamp with
+    nanosecond precision.
+    """
+
+    def formatter(self, api_client, data, value):
+        if not value:
+            return None
+
+        return datetime.utcfromtimestamp(value["time"] / 1000)
+
+
 class ModelMetaClass(type):
 
     def __new__(cls, name, parents, dct):
@@ -84,10 +98,6 @@ class PandoraModel(with_metaclass(ModelMetaClass, object)):
     consumers of these instances can ignore all of the details of this class.
     """
 
-    @staticmethod
-    def json_to_date(api_client, data):
-        return datetime.utcfromtimestamp(data["time"] / 1000)
-
     @classmethod
     def from_json_list(cls, api_client, data):
         """Convert a list of JSON values to a list of models