Abstract github datetime serialize

copitux · copitux · commit 9b2b5b9c975a · 2012-09-20T18:04:05.000+02:00
With Json coder/decoder hooks
diff --git a/pygithub3/core/compat.py b/pygithub3/core/compat.py
@@ -2,11 +2,6 @@
 # -*- encoding: utf-8 -*-
 """ Utils to support python 2.6 compatibility """
 
-try:
-    import simplejson as json
-except ImportError:
-    import json
-
 from collections import MutableMapping
 
 
diff --git a/pygithub3/core/errors.py b/pygithub3/core/errors.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- encoding: utf-8 -*-
 
-from pygithub3.core.compat import json
+from pygithub3.core import json
 from pygithub3.exceptions import NotFound, BadRequest, UnprocessableEntity
 
 
diff --git a/pygithub3/core/json/__init__.py b/pygithub3/core/json/__init__.py
@@ -0,0 +1,41 @@
+# -*- coding: utf-8 -*-
+"""
+Emulate json module with encode/decoders to support github datetime format
+"""
+
+from datetime import datetime
+try:
+    import simplejson as json
+except ImportError:
+    import json
+
+GITHUB_DATE_FORMAT = '%Y-%m-%dT%H:%M:%SZ'
+
+
+class GHJSONEncoder(json.JSONEncoder):
+    def default(self, o):
+        try:
+            return datetime.strftime(o, GITHUB_DATE_FORMAT)
+        except:
+            return super(GHJSONEncoder, self).default(o)
+
+
+def gh_decoder_hook(dict_):
+    for k, v in dict_.iteritems():
+        try:
+            date = datetime.strptime(v, GITHUB_DATE_FORMAT)
+            dict_[k] = date
+        except:
+            continue
+    return dict_
+
+
+def dumps(obj, cls=GHJSONEncoder, **kwargs):
+    return json.dumps(obj, cls=cls, **kwargs)
+
+
+def loads(s, object_hook=gh_decoder_hook, **kwargs):
+    return json.loads(s, object_hook=object_hook, **kwargs)
+
+dump = json.dump
+load = json.load
diff --git a/pygithub3/requests/base.py b/pygithub3/requests/base.py
@@ -3,7 +3,8 @@
 
 import re
 
-from pygithub3.core.compat import import_module, json
+from pygithub3.core import json
+from pygithub3.core.compat import import_module
 from pygithub3.exceptions import (RequestDoesNotExist, UriInvalid,
                                   ValidationError, InvalidBodySchema)
 from pygithub3.resources.base import Raw
diff --git a/pygithub3/resources/base.py b/pygithub3/resources/base.py
@@ -1,11 +1,6 @@
-#!/usr/bin/env python
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
 
-from datetime import datetime
-
-from pygithub3.core.compat import json
-
-GITHUB_DATE_FORMAT = '%Y-%m-%dT%H:%M:%SZ'
+from pygithub3.core import json
 
 
 class Resource(object):
@@ -15,7 +10,6 @@ class Resource(object):
     _collection_maps = {}
 
     def __init__(self, attrs):
-        """ """
         self._attrs = attrs
         self.__set_attrs()
 
@@ -47,13 +41,6 @@ def wrapper(resource, raw_resource):
                 return func(resource, raw_resource)
             return wrapper
 
-        def parse_date(string_date):
-            try:
-                date = datetime.strptime(string_date, GITHUB_DATE_FORMAT)
-            except TypeError:
-                date = None
-            return date
-
         @self_resource
         def parse_map(resource, raw_resource):
             if hasattr(raw_resource, 'items'):
@@ -73,9 +60,6 @@ def parse_collection_map(resource, raw_resources):
                         for raw_resource in raw_resources]
 
         new_resource = raw_resource.copy()
-        new_resource.update(dict([
-            (attr, parse_date(raw_resource[attr]))
-             for attr in self._dates if attr in raw_resource]))
         new_resource.update(dict([
             (attr, parse_map(resource, raw_resource[attr]))
              for attr, resource in self._maps.items()
