Merge pull request #104 from codl/fix-string-ids

fix string id support to also include in_reply_to_... fields

1 files changed, 8 insertions, 11 deletions

diff --git a/mastodon/Mastodon.py b/mastodon/Mastodon.py
index 88f4906..c4e50f3 100644
--- a/mastodon/Mastodon.py
+++ b/mastodon/Mastodon.py
@@ -17,6 +17,7 @@ import re
 import copy
 import threading
 import sys
+import six
 
 try:
     from urllib.parse import urlparse
@@ -1083,17 +1084,13 @@ class Mastodon:
         """
         Converts json string IDs to native python bignums.
         """
-        if sys.version_info.major >= 3:
-            str_type = str
-        else:
-            str_type = unicode
-
-        if ('id' in json_object and
-                isinstance(json_object['id'], str_type)):
-            try:
-                json_object['id'] = int(json_object['id'])
-            except ValueError:
-                pass
+        for key in ('id', 'in_reply_to_id', 'in_reply_to_account_id'):
+            if (key in json_object and
+                    isinstance(json_object[key], six.text_type)):
+                try:
+                    json_object[key] = int(json_object[key])
+                except ValueError:
+                    pass
 
         return json_object