Merge pull request #83 from codl/1.1.0-fix-log-in

fix exception in log_in, by accepting json dates as timestamps

1 files changed, 4 insertions, 1 deletions

diff --git a/mastodon/Mastodon.py b/mastodon/Mastodon.py
index ed8901c..d427444 100644
--- a/mastodon/Mastodon.py
+++ b/mastodon/Mastodon.py
@@ -973,7 +973,10 @@ class Mastodon:
         for k, v in json_object.items():
             if k in known_date_fields:
                 try:
-                    json_object[k] = dateutil.parser.parse(v)
+                    if isinstance(v, int):
+                        json_object[k] = datetime.datetime.fromtimestamp(v, pytz.utc)
+                    else:
+                        json_object[k] = dateutil.parser.parse(v)
                 except:
                     raise MastodonAPIError('Encountered invalid date.')
         return json_object