Merge remote-tracking branch 'origin/october3' into october3

jsmnbom · jsmnbom · commit f3b8a3a5e9e7 · 2016-10-03T20:10:14.000+02:00
diff --git a/telegram/bot.py b/telegram/bot.py
@@ -1432,14 +1432,12 @@ def getChatMember(self, chat_id, user_id, **kwargs):
                 the definitive timeout (in seconds) for urlopen() operations.
 
         Returns:
-            :class:`telegram.ChatMember`: On success,
-            :class:`telegram.ChatMember` is returned.
+            :class:`telegram.ChatMember`
 
         Raises:
             :class:`telegram.TelegramError`
 
         """
-
         url = '{0}/getChatMember'.format(self.base_url)
 
         data = {'chat_id': chat_id, 'user_id': user_id}
@@ -1449,6 +1447,14 @@ def getChatMember(self, chat_id, user_id, **kwargs):
         return ChatMember.de_json(result, self)
 
     def getWebhookInfo(self, **kwargs):
+        """Use this method to get current webhook status.
+
+        If the bot is using getUpdates, will return an object with the url field empty.
+
+        Returns:
+            :class: `telegram.WebhookInfo`
+
+        """
         url = '{0}/getWebhookInfo'.format(self.base_url)
 
         data = {}
@@ -1475,7 +1481,7 @@ def __reduce__(self):
         return (self.__class__, (self.token, self.base_url.replace(self.token, ''),
                                  self.base_file_url.replace(self.token, '')))
 
-# snake_case (PEP8) aliases
+    # snake_case (PEP8) aliases
 
     get_me = getMe
     send_message = sendMessage
diff --git a/telegram/webhookinfo.py b/telegram/webhookinfo.py
@@ -25,18 +25,19 @@ class WebhookInfo(TelegramObject):
     """This object represents a Telegram WebhookInfo.
 
     Attributes:
-        url (str): Webhook URL, may be empty if webhook is not set up
+        url (str): Webhook URL, may be empty if webhook is not set up.
         has_custom_certificate (bool):
         pending_update_count (int):
         last_error_date (Optional[int]):
         last_error_message (Optional[str]):
 
     Args:
-        url (str): Webhook URL, may be empty if webhook is not set up
+        url (str): Webhook URL, may be empty if webhook is not set up.
         has_custom_certificate (bool):
         pending_update_count (int):
         last_error_date (Optional[int]):
         last_error_message (Optional[str]):
+
     """
 
     def __init__(self, url, has_custom_certificate, pending_update_count, **kwargs):
@@ -56,6 +57,7 @@ def de_json(data, bot):
 
         Returns:
             telegram.WebhookInfo:
+
         """
         if not data:
             return None
