Merge pull request singer-io#41 from singer-io/feature/strptime_with_tz-enforces-tz

psantacl · web-flow · commit cbc79edebec2 · 2017-09-20T09:46:04.000-04:00
strptime_with_tz will always return a tz aware datetime object
diff --git a/singer/utils.py b/singer/utils.py
@@ -5,15 +5,22 @@
 import json
 import time
 import dateutil
+import pytz
 
 from singer.catalog import Catalog
 
 DATETIME_PARSE = "%Y-%m-%dT%H:%M:%SZ"
 DATETIME_FMT = "%Y-%m-%dT%H:%M:%S.%fZ"
 
+def now():
+    return datetime.datetime.utcnow().replace(tzinfo=pytz.UTC)
 
 def strptime_with_tz(dtime):
-    return dateutil.parser.parse(dtime)
+    d_object = dateutil.parser.parse(dtime)
+    if d_object.tzinfo is None:
+        return d_object.replace(tzinfo=pytz.UTC)
+
+    return d_object
 
 def strptime(dtime):
     try:
