Add missing json import.

[z_archive/twitter.git] / twitter / archiver.py

diff --git a/twitter/archiver.py b/twitter/archiver.py
index 456ce66e3de843b1477f56b2134235936deb5b95..6f2468a6e03cec1120a88d15bc5bf32a4ba9f20a 100644 (file)
--- a/twitter/archiver.py
+++ b/twitter/archiver.py
@@ -129,14 +129,18 @@ def save_tweets(filename, tweets):
 
     archive.close()
 
-def format_date(utc, to_localtime=True, isoformat=False):
+def format_date(utc, isoformat=False):
     """Parse Twitter's UTC date into UTC or local time."""
     u = datetime.strptime(utc.replace('+0000','UTC'), '%a %b %d %H:%M:%S %Z %Y')
+    # This is the least painful way I could find to create a non-naive
+    # datetime including a UTC timezone. Alternative suggestions
+    # welcome.
     unew = datetime.combine(u.date(), time(u.time().hour,
         u.time().minute, u.time().second, tzinfo=UTC))
 
-    if to_localtime and _time.timezone != 0:
-        unew = unew.astimezone(Local)
+    # Convert to localtime
+    unew = unew.astimezone(Local)
+
     if isoformat:
         return unew.isoformat()
     else:
@@ -389,7 +393,7 @@ def main(args=sys.argv[1:]):
         dms = {}
         try:
             dms = load_tweets(filename)
-        except Exception, e:
+        except Exception as e:
             err("Error when loading saved DMs: %s - continuing without"
                 % str(e))