Merge remote-tracking branch 'origin/master' into bot2.1

leandrotoledo · leandrotoledo · commit 9a13de4a96f8 · 2016-05-26T16:15:50.000-03:00
Conflicts:
	telegram/bot.py
	tests/test_bot.py
diff --git a/examples/inlinekeyboard_example.py b/examples/inlinekeyboard_example.py
@@ -97,7 +97,7 @@ def error(bot, update, error):
 updater = Updater("TOKEN")
 
 # The command
-updater.dispatcher.addHandler(CommandHandler('set', set_value))
+updater.dispatcher.add_handler(CommandHandler('set', set_value))
 # The answer
 updater.dispatcher.add_handler(MessageHandler([Filters.text], entered_value))
 # The confirmation
diff --git a/telegram/bot.py b/telegram/bot.py
@@ -24,8 +24,8 @@
 
 from telegram import (User, Message, Update, Chat, ChatMember, UserProfilePhotos, File,
                       ReplyMarkup, TelegramObject, NullHandler)
+from telegram.error import InvalidToken
 from telegram.utils import request
-from telegram.utils.validate import validate_token
 
 logging.getLogger(__name__).addHandler(NullHandler())
 
@@ -48,7 +48,7 @@ class Bot(TelegramObject):
     """
 
     def __init__(self, token, base_url=None, base_file_url=None):
-        self.token = validate_token(token)
+        self.token = self._validate_token(token)
 
         if not base_url:
             self.base_url = 'https://api.telegram.org/bot{0}'.format(self.token)
@@ -64,6 +64,18 @@ def __init__(self, token, base_url=None, base_file_url=None):
 
         self.logger = logging.getLogger(__name__)
 
+    @staticmethod
+    def _validate_token(token):
+        """a very basic validation on token"""
+        if any(x.isspace() for x in token):
+            raise InvalidToken()
+
+        left, sep, _right = token.partition(':')
+        if (not sep) or (not left.isdigit()) or (len(left) < 3):
+            raise InvalidToken()
+
+        return token
+
     def info(func):
 
         @functools.wraps(func)
diff --git a/telegram/utils/validate.py b/telegram/utils/validate.py
diff --git a/tests/test_bot.py b/tests/test_bot.py
@@ -188,6 +188,13 @@ def testInvalidToken2(self):
     def testInvalidToken3(self):
         self._test_invalid_token('12:')
 
+    def testInvalidToken4(self):
+        # white spaces are invalid
+        self._test_invalid_token('1234:abcd1234\n')
+        self._test_invalid_token(' 1234:abcd1234')
+        self._test_invalid_token(' 1234:abcd1234\r')
+        self._test_invalid_token('1234:abcd 1234')
+
     def testUnauthToken(self):
         with self.assertRaisesRegexp(telegram.error.Unauthorized, 'Unauthorized'):
             bot = telegram.Bot('1234:abcd1234')
