...
|
...
|
@@ -169,7 +169,13 @@ def formatDateTime(s3timestamp):
|
169
|
169
|
try:
|
170
|
170
|
import pytz
|
171
|
171
|
timezone = pytz.timezone(os.environ.get('TZ', 'UTC'))
|
172
|
|
- utc_dt = datetime.datetime(*dateS3toPython(s3timestamp)[0:6], tzinfo=pytz.timezone('UTC'))
|
|
172
|
+ tz = pytz.timezone('UTC')
|
|
173
|
+ ## Can't unpack args and follow that with kwargs in python 2.5
|
|
174
|
+ ## So we pass them all as kwargs
|
|
175
|
+ params = zip(('year', 'month', 'day', 'hour', 'minute', 'second', 'tzinfo'),
|
|
176
|
+ dateS3toPython(s3timestamp)[0:6] + (tz))
|
|
177
|
+ params = dict(params)
|
|
178
|
+ utc_dt = datetime.datetime(**params)
|
173
|
179
|
dt_object = utc_dt.astimezone(timezone)
|
174
|
180
|
except ImportError:
|
175
|
181
|
dt_object = datetime.datetime(*dateS3toPython(s3timestamp)[0:6])
|