Merge remote-tracking branch 'Roguelazer/tz_support' into Roguelazer-…

…merge

S3/Utils.py

@@ -3,6 +3,7 @@
 ##         http://www.logix.cz/michal
 ## License: GPL Version 2
 
+import datetime
 import os
 import sys
 import time
@@ -16,6 +17,7 @@
 
 from logging import debug, info, warning, error
 
+
 import Config
 import Exceptions
 
@@ -163,7 +165,14 @@ def formatSize(size, human_readable = False, floating_point = False):
 __all__.append("formatSize")
 
 def formatDateTime(s3timestamp):
-    return time.strftime("%Y-%m-%d %H:%M", dateS3toPython(s3timestamp))
+    try:
+        import pytz
+        timezone = pytz.timezone(os.environ.get('TZ', 'UTC'))
+        utc_dt = datetime.datetime(*dateS3toPython(s3timestamp)[0:6], tzinfo=pytz.timezone('UTC'))
+        dt_object = utc_dt.astimezone(timezone)
+    except ImportError:
+        dt_object = datetime.datetime(*dateS3toPython(s3timestamp)[0:6])
+    return dt_object.strftime("%Y-%m-%d %H:%M")
 __all__.append("formatDateTime")
 
 def convertTupleListToDict(list):