Merge remote-tracking branch 'refs/remotes/origin/develop' into develop

cogs/general.py

@@ -189,7 +189,7 @@ class General:
                 return
         if not self.getPollByChannel(message):
             p = NewPoll(message, self)
-            if p.valid: 
+            if p.valid:
                 self.poll_sessions.append(p)
                 await p.start()
             else:
@@ -214,7 +214,7 @@ class General:
         return False
 
     async def check_poll_votes(self, message):
-        if message.author.id != self.bot.user.id:            
+        if message.author.id != self.bot.user.id:
             if self.getPollByChannel(message):
                     self.getPollByChannel(message).checkAnswer(message)
 
@@ -229,7 +229,7 @@ class NewPoll():
         msg = msg.split(";")
         if len(msg) < 2: # Needs at least one question and 2 choices
             self.valid = False
-            return None 
+            return None
         else:
             self.valid = True
         self.already_voted = []
@@ -275,4 +275,4 @@ class NewPoll():
 def setup(bot):
     n = General(bot)
     bot.add_listener(n.check_poll_votes, "on_message")
-    bot.add_cog(n)
+    bot.add_cog(n)