Refactor Poll.

delivrance · delivrance · commit 2b568afd2acd · 2018-12-23T17:00:50.000+01:00
Move PollAnswer into poll.py and rename it to PollOption
diff --git a/pyrogram/__init__.py b/pyrogram/__init__.py
@@ -32,7 +32,7 @@
     Location, Message, MessageEntity, Dialog, Dialogs, Photo, PhotoSize, Sticker, User, UserStatus,
     UserProfilePhotos, Venue, Animation, Video, VideoNote, Voice, CallbackQuery, Messages, ForceReply,
     InlineKeyboardButton, InlineKeyboardMarkup, KeyboardButton, ReplyKeyboardMarkup, ReplyKeyboardRemove,
-    Poll, PollAnswer
+    Poll
 )
 from .client import (
     Client, ChatAction, ParseMode, Emoji,
diff --git a/pyrogram/client/types/__init__.py b/pyrogram/client/types/__init__.py
@@ -31,7 +31,7 @@
 from .messages_and_media import (
     Audio, Contact, Document, Animation, Location, Photo, PhotoSize,
     Sticker, Venue, Video, VideoNote, Voice, UserProfilePhotos,
-    Message, Messages, MessageEntity, Poll, PollAnswer
+    Message, Messages, MessageEntity, Poll
 )
 from .user_and_chats import (
     Chat, ChatMember, ChatMembers, ChatPhoto,
diff --git a/pyrogram/client/types/messages_and_media/__init__.py b/pyrogram/client/types/messages_and_media/__init__.py
@@ -27,7 +27,6 @@
 from .photo import Photo
 from .photo_size import PhotoSize
 from .poll import Poll
-from .poll_answer import PollAnswer
 from .sticker import Sticker
 from .user_profile_photos import UserProfilePhotos
 from .venue import Venue
diff --git a/pyrogram/client/types/messages_and_media/poll.py b/pyrogram/client/types/messages_and_media/poll.py
@@ -20,49 +20,60 @@
 
 import pyrogram
 from pyrogram.api import types
-from .poll_answer import PollAnswer
 from ..pyrogram_type import PyrogramType
 
 
+class PollOption(PyrogramType):
+    def __init__(self,
+                 *,
+                 client: "pyrogram.client.ext.BaseClient",
+                 text: str,
+                 voters: int):
+        super().__init__(client)
+
+        self.text = text
+        self.voters = voters
+
+
 class Poll(PyrogramType):
     def __init__(self,
                  *,
                  client: "pyrogram.client.ext.BaseClient",
                  id: int,
                  closed: bool,
                  question: str,
-                 answers: List[PollAnswer],
-                 answer_chosen: int = None,
+                 options: List[PollOption],
+                 option_chosen: int = None,
                  total_voters: int):
         super().__init__(client)
 
         self.id = id
         self.closed = closed
         self.question = question
-        self.answers = answers
-        self.answer_chosen = answer_chosen
+        self.options = options
+        self.option_chosen = option_chosen
         self.total_voters = total_voters
 
     @staticmethod
     def _parse(client, media_poll: types.MessageMediaPoll) -> "Poll":
         poll = media_poll.poll
         results = media_poll.results.results
         total_voters = media_poll.results.total_voters
-        answer_chosen = None
+        option_chosen = None
 
-        answers = []
+        options = []
 
         for i, answer in enumerate(poll.answers):
-            voters = None
+            voters = 0
 
             if results:
                 result = results[i]
                 voters = result.voters
 
                 if result.chosen:
-                    answer_chosen = i
+                    option_chosen = i
 
-            answers.append(PollAnswer(
+            options.append(PollOption(
                 text=answer.text,
                 voters=voters,
                 client=client
@@ -72,8 +83,8 @@ def _parse(client, media_poll: types.MessageMediaPoll) -> "Poll":
             id=poll.id,
             closed=poll.closed,
             question=poll.question,
-            answers=answers,
-            answer_chosen=answer_chosen,
+            options=options,
+            option_chosen=option_chosen,
             total_voters=total_voters,
             client=client
         )
diff --git a/pyrogram/client/types/messages_and_media/poll_answer.py b/pyrogram/client/types/messages_and_media/poll_answer.py

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@`
`32`	`32`	`Location, Message, MessageEntity, Dialog, Dialogs, Photo, PhotoSize, Sticker, User, UserStatus,`
`33`	`33`	`UserProfilePhotos, Venue, Animation, Video, VideoNote, Voice, CallbackQuery, Messages, ForceReply,`
`34`	`34`	`InlineKeyboardButton, InlineKeyboardMarkup, KeyboardButton, ReplyKeyboardMarkup, ReplyKeyboardRemove,`
`35`		`- Poll, PollAnswer`
	`35`	`+ Poll`
`36`	`36`	`)`
`37`	`37`	`from .client import (`
`38`	`38`	`Client, ChatAction, ParseMode, Emoji,`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@`
`31`	`31`	`from .messages_and_media import (`
`32`	`32`	`Audio, Contact, Document, Animation, Location, Photo, PhotoSize,`
`33`	`33`	`Sticker, Venue, Video, VideoNote, Voice, UserProfilePhotos,`
`34`		`- Message, Messages, MessageEntity, Poll, PollAnswer`
	`34`	`+ Message, Messages, MessageEntity, Poll`
`35`	`35`	`)`
`36`	`36`	`from .user_and_chats import (`
`37`	`37`	`Chat, ChatMember, ChatMembers, ChatPhoto,`