v2.2.5 Ensure 4-digit years

Author: akariv

datapackage_pipelines/VERSION

@@ -1,2 +1,2 @@
-2.2.4
+2.2.5
 

datapackage_pipelines/lib/dump/file_formats.py

@@ -4,7 +4,10 @@
 import isodate
 import logging
 
-from datapackage_pipelines.utilities.extended_json import DATETIME_FORMAT, DATE_FORMAT, TIME_FORMAT
+from datapackage_pipelines.utilities.extended_json import (
+    DATETIME_F_FORMAT, DATE_F_FORMAT, TIME_F_FORMAT,
+    DATETIME_P_FORMAT, DATE_P_FORMAT, TIME_P_FORMAT,
+)
 from datapackage_pipelines.utilities.resources import get_path
 
 
@@ -47,9 +50,9 @@ class CSVFormat(FileFormat):
     SERIALIZERS = {
         'array': json_dumps,
         'object': json_dumps,
-        'datetime': lambda d: d.strftime(DATETIME_FORMAT),
-        'date': lambda d: d.strftime(DATE_FORMAT),
-        'time': lambda d: d.strftime(TIME_FORMAT),
+        'datetime': lambda d: d.strftime(DATETIME_F_FORMAT),
+        'date': lambda d: d.strftime(DATE_F_FORMAT),
+        'time': lambda d: d.strftime(TIME_F_FORMAT),
         'duration': lambda d: isodate.duration_isoformat(d),
         'geopoint': lambda d: '{}, {}'.format(*d),
         'geojson': json.dumps,
@@ -65,13 +68,13 @@ class CSVFormat(FileFormat):
             'groupChar': ''
         },
         'date': {
-            'format': DATE_FORMAT
+            'format': DATE_P_FORMAT
         },
         'time': {
-            'format': TIME_FORMAT
+            'format': TIME_P_FORMAT
         },
         'datetime': {
-            'format': DATETIME_FORMAT
+            'format': DATETIME_P_FORMAT
         },
     }
 
@@ -104,9 +107,9 @@ def finalize_file(self, writer):
 class JSONFormat(FileFormat):
 
     SERIALIZERS = {
-        'datetime': lambda d: d.strftime(DATETIME_FORMAT),
-        'date': lambda d: d.strftime(DATE_FORMAT),
-        'time': lambda d: d.strftime(TIME_FORMAT),
+        'datetime': lambda d: d.strftime(DATETIME_F_FORMAT),
+        'date': lambda d: d.strftime(DATE_F_FORMAT),
+        'time': lambda d: d.strftime(TIME_F_FORMAT),
         'number': float,
         'duration': lambda d: isodate.duration_isoformat(d),
         'geopoint': lambda d: list(map(float, d)),
@@ -117,13 +120,13 @@ class JSONFormat(FileFormat):
 
     PYTHON_DIALECT = {
         'date': {
-            'format': DATE_FORMAT
+            'format': DATE_P_FORMAT
         },
         'time': {
-            'format': TIME_FORMAT
+            'format': TIME_P_FORMAT
         },
         'datetime': {
-            'format': DATETIME_FORMAT
+            'format': DATETIME_P_FORMAT
         },
     }
 

datapackage_pipelines/utilities/extended_json.py

@@ -6,11 +6,20 @@
 
 from .lazy_dict import LazyDict
 
-
-DATE_FORMAT = '%Y-%m-%d'
-DATETIME_FORMAT = '%Y-%m-%d %H:%M:%S'
+if datetime.date(1, 1, 1).strftime('%04Y') == '4Y':
+    DATE_F_FORMAT = '%Y-%m-%d'
+    DATETIME_F_FORMAT = '%Y-%m-%d %H:%M:%S'
+else:
+    DATE_F_FORMAT = '%04Y-%m-%d'
+    DATETIME_F_FORMAT = '%04Y-%m-%d %H:%M:%S'
+DATE_FORMAT = DATE_F_FORMAT
+DATETIME_FORMAT = DATETIME_F_FORMAT
 TIME_FORMAT = '%H:%M:%S'
 
+DATE_P_FORMAT = '%Y-%m-%d'
+DATETIME_P_FORMAT = '%Y-%m-%d %H:%M:%S'
+TIME_P_FORMAT = TIME_F_FORMAT = TIME_FORMAT
+
 
 class LazyJsonLine(LazyDict):
 
@@ -57,13 +66,13 @@ def object_hook(cls, obj):
         if 'type{datetime}' in obj:
             try:
                 return datetime.datetime \
-                    .strptime(obj["type{datetime}"], DATETIME_FORMAT)
+                    .strptime(obj["type{datetime}"], DATETIME_P_FORMAT)
             except ValueError:
                 pass
         if 'type{date}' in obj:
             try:
                 return datetime.datetime \
-                    .strptime(obj["type{date}"], DATE_FORMAT) \
+                    .strptime(obj["type{date}"], DATE_P_FORMAT) \
                     .date()
             except ValueError:
                 pass
@@ -98,9 +107,9 @@ def default(self, obj):
         elif isinstance(obj, datetime.time):
             return {'type{time}': obj.strftime(TIME_FORMAT)}
         elif isinstance(obj, datetime.datetime):
-            return {'type{datetime}': obj.strftime(DATETIME_FORMAT)}
+            return {'type{datetime}': obj.strftime(DATETIME_F_FORMAT)}
         elif isinstance(obj, datetime.date):
-            return {'type{date}': obj.strftime(DATE_FORMAT)}
+            return {'type{date}': obj.strftime(DATE_F_FORMAT)}
         elif isinstance(obj, (isodate.Duration, datetime.timedelta)):
             return {'type{duration}': isodate.duration_isoformat(obj)}
         elif isinstance(obj, set):