Issue 520 (python-telegram-bot#521)

Eldinnie · jh0ker · commit 34ebb7fe5a8b · 2017-02-27T14:27:06.000+01:00
* stripping token of whitespaces before starting bot

* Line feed

* fixed chat parameter all_members_are_administrators
diff --git a/telegram/chat.py b/telegram/chat.py
@@ -32,7 +32,7 @@ class Chat(TelegramObject):
         username (str): Username, for private chats and channels if available
         first_name (str): First name of the other party in a private chat
         last_name (str): Last name of the other party in a private chat
-        all_members_are_admins (bool): True if a group has 'All Members Are Admins' enabled.
+        all_members_are_administrators (bool): True if group has 'All Members Are Administrators'
 
     Args:
         id (int):
@@ -57,7 +57,7 @@ def __init__(self,
                  username='',
                  first_name='',
                  last_name='',
-                 all_members_are_admins=False,
+                 all_members_are_administrators=False,
                  bot=None,
                  **kwargs):
         # Required
@@ -68,7 +68,7 @@ def __init__(self,
         self.username = username
         self.first_name = first_name
         self.last_name = last_name
-        self.all_members_are_admins = all_members_are_admins
+        self.all_members_are_administrators = all_members_are_administrators
 
         self.bot = bot
 
diff --git a/tests/test_chat.py b/tests/test_chat.py
@@ -36,13 +36,13 @@ def setUp(self):
         self.id = -28767330
         self.title = 'ToledosPalaceBot - Group'
         self.type = 'group'
-        self.all_members_are_admins = False
+        self.all_members_are_administrators = False
 
         self.json_dict = {
             'id': self.id,
             'title': self.title,
             'type': self.type,
-            'all_members_are_admins': self.all_members_are_admins
+            'all_members_are_administrators': self.all_members_are_administrators
         }
 
     def test_group_chat_de_json_empty_json(self):
@@ -56,7 +56,8 @@ def test_group_chat_de_json(self):
         self.assertEqual(group_chat.id, self.id)
         self.assertEqual(group_chat.title, self.title)
         self.assertEqual(group_chat.type, self.type)
-        self.assertEqual(group_chat.all_members_are_admins, self.all_members_are_admins)
+        self.assertEqual(group_chat.all_members_are_administrators,
+                         self.all_members_are_administrators)
 
     def test_group_chat_to_json(self):
         group_chat = telegram.Chat.de_json(self.json_dict, self._bot)
@@ -70,7 +71,8 @@ def test_group_chat_to_dict(self):
         self.assertEqual(group_chat['id'], self.id)
         self.assertEqual(group_chat['title'], self.title)
         self.assertEqual(group_chat['type'], self.type)
-        self.assertEqual(group_chat['all_members_are_admins'], self.all_members_are_admins)
+        self.assertEqual(group_chat['all_members_are_administrators'],
+                         self.all_members_are_administrators)
 
     @flaky(3, 1)
     def test_send_action(self):
