Bugfixes

Author: pevdh

telebot/apihelper.py

@@ -72,8 +72,8 @@ def make_json_request(self, method_name, params=None, files=None, method='post',
         if not response['ok']:
             raise ApiException('Error code: {error_code} Description: {description}'.format(**response), method)
 
-        if hasattr(return_type, 'de_json'):
-            return return_type.de_json(response['result'])
+        if issubclass(return_type, types.JsonDeserializable):
+            return types.de_json(return_type, response['result'])
         return response['result']
 
     def get_updates(self, **kwargs):
@@ -85,7 +85,7 @@ def get_updates(self, **kwargs):
         :return: list of Updates
         """
         json_updates = self.make_json_request('getUpdates', params=util.xmerge(kwargs))
-        return [types.Update.de_json(update) for update in json_updates]
+        return [types.de_json(types.Update, update) for update in json_updates]
 
     def get_me(self):
         return self.make_json_request('getMe', return_type=types.User)
@@ -342,7 +342,7 @@ def get_chat_administrators(self, chat_id):
         :return: Array of ChatMember objects
         """
         response = self.make_json_request('getChatAdministrators', params={'chat_id': chat_id})
-        return [types.ChatMember.de_json(e) for e in response]
+        return types.de_json_array(types.ChatMember, response)
 
     def get_chat_members_count(self, chat_id):
         """
@@ -369,7 +369,7 @@ def get_chat_member(self, chat_id, user_id):
     def edit_message_text(self, text, **kwargs):
         params = util.xmerge({'text': text}, kwargs)
         response = self.make_json_request('editMessageText', params=params)
-        return response if type(response) == bool else types.Message.de_json(response)
+        return response if type(response) == bool else types.de_json(types.Message, response)
 
     def edit_message_caption(self, caption, **kwargs):
         params = util.xmerge({'caption': caption}, kwargs)

telebot/telebot_class.py

@@ -54,7 +54,7 @@ def __call_listener(listener, update):
         return r if r is not None else True
 
     def process_new_updates(self, updates):
-        logger.debug('Received {0} new updates'.format(len(updates)))
+        logger.debug('Received {0} new updates'.format(len(list(updates))))
         for update in updates:
             self.update_listeners = filter(lambda l: self.__call_listener(l, update), self.update_listeners)