Pass all args as kwargs instead of *glob + kwargs=

s3tools · Feb 20, 2013 · b6ff1fc · b6ff1fc
1 parent 8bcfe31
commit b6ff1fc
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/S3/Utils.py b/S3/Utils.py
@@ -169,7 +169,13 @@ def formatDateTime(s3timestamp):
     try:
         import pytz
         timezone = pytz.timezone(os.environ.get('TZ', 'UTC'))
-        utc_dt = datetime.datetime(*dateS3toPython(s3timestamp)[0:6], tzinfo=pytz.timezone('UTC'))
+        tz = pytz.timezone('UTC')
+        ## Can't unpack args and follow that with kwargs in python 2.5
+        ## So we pass them all as kwargs
+        params = zip(('year', 'month', 'day', 'hour', 'minute', 'second', 'tzinfo'),
+                     dateS3toPython(s3timestamp)[0:6] + (tz))
+        params = dict(params)
+        utc_dt = datetime.datetime(**params)
         dt_object = utc_dt.astimezone(timezone)
     except ImportError:
         dt_object = datetime.datetime(*dateS3toPython(s3timestamp)[0:6])