diff options
author | codl <[email protected]> | 2017-09-10 12:23:54 +0200 |
---|---|---|
committer | codl <[email protected]> | 2017-09-10 12:23:54 +0200 |
commit | 92dd24450dc3795b25bfbcbc767d6e52498d92c7 (patch) | |
tree | 9c53bb349b8fb981a63cd365370e6f4f41a9a432 /mastodon | |
parent | 7ded08fd84a8c136ee8da65f8c6238910aca71d9 (diff) | |
download | mastodon.py-92dd24450dc3795b25bfbcbc767d6e52498d92c7.tar.gz |
fix exception in log_in, by accepting json dates as timestamps
when requesting a bearer token, mastodon (more specifically doorkeeper)
returns an object with a created_at attribute which is a plain timestamp
unlike in most of mastodon's api:
{
"access_token": "hunter2",
"token_type": "bearer",
"scope": "read write",
"created_at": 1504824250,
}
Diffstat (limited to 'mastodon')
-rw-r--r-- | mastodon/Mastodon.py | 5 |
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: | |||
973 | for k, v in json_object.items(): | 973 | for k, v in json_object.items(): |
974 | if k in known_date_fields: | 974 | if k in known_date_fields: |
975 | try: | 975 | try: |
976 | json_object[k] = dateutil.parser.parse(v) | 976 | if isinstance(v, int): |
977 | json_object[k] = datetime.datetime.fromtimestamp(v, pytz.utc) | ||
978 | else: | ||
979 | json_object[k] = dateutil.parser.parse(v) | ||
977 | except: | 980 | except: |
978 | raise MastodonAPIError('Encountered invalid date.') | 981 | raise MastodonAPIError('Encountered invalid date.') |
979 | return json_object | 982 | return json_object |