Merge #105

Sorry Nicolas, I had to kind of mangled this

tests/decoding_test.py

@@ -47,6 +47,8 @@ def tag(value):
     elif isinstance(value, datetime.datetime):
         return {'type': 'datetime', 'value': value.isoformat()
                 .replace('+00:00', 'Z')}
+    elif isinstance(value, datetime.time):
+        return {'type': 'time', 'value': value.strftime('%H:%M:%S.%f')}
     assert False, 'Unknown type: %s' % type(value)
 
 

toml/decoder.py

@@ -44,6 +44,9 @@ def _getpath(p):
     FNFError = IOError
 
 
+TIME_RE = re.compile("([0-9]{2}):([0-9]{2}):([0-9]{2})(\.([0-9]{3,6}))?")
+
+
 class TomlDecodeError(ValueError):
     """Base toml Exception / Error."""
 
@@ -687,6 +690,10 @@ def load_value(self, v, strictly_valid=True):
             inline_object = self.get_empty_inline_table()
             self.load_inline_object(v, inline_object)
             return (inline_object, "inline_object")
+        elif TIME_RE.match(v):
+            h, m, s, _, ms = TIME_RE.match(v).groups()
+            time = datetime.time(int(h), int(m), int(s), int(ms) if ms else 0)
+            return (time, "time")
         else:
             parsed_date = _load_date(v)
             if parsed_date is not None:

toml/encoder.py

@@ -99,6 +99,14 @@ def _dump_float(v):
     return "{0:.16}".format(v).replace("e+0", "e+").replace("e-0", "e-")
 
 
+def _dump_time(v):
+    utcoffset = v.utcoffset()
+    if utcoffset is None:
+        return v.isoformat()
+    # The TOML norm specifies that it's local time thus we drop the offset
+    return v.isoformat()[:-6]
+
+
 class TomlEncoder(object):
 
     def __init__(self, _dict=dict, preserve=False):
@@ -112,6 +120,7 @@ def __init__(self, _dict=dict, preserve=False):
             int: lambda v: v,
             float: _dump_float,
             datetime.datetime: lambda v: v.isoformat().replace('+00:00', 'Z'),
+            datetime.time: _dump_time,
         }
 
     def get_empty_table(self):