None conditions

JosXa · JosXa · commit e33b2e3b1fab · 2018-03-16T21:50:15.000+01:00
diff --git a/telegram/utils/helpers.py b/telegram/utils/helpers.py
@@ -161,6 +161,9 @@ def create_deep_linked_url(bot_username, payload=None):
     Returns:
         :obj:`str`: An URL to start the bot with specific parameters
     """
+    if bot_username is None or len(bot_username) <= 3:
+        raise ValueError("You must provide a valid bot_username.")
+
     base_url = 'https://t.me/{}'.format(bot_username)
     if not payload:
         return base_url
diff --git a/tests/test_helpers.py b/tests/test_helpers.py
@@ -18,9 +18,8 @@
 # along with this program.  If not, see [http://www.gnu.org/licenses/].
 import pytest
 
-from telegram import Update
-
 from telegram import Sticker
+from telegram import Update
 from telegram import User
 from telegram.message import Message
 from telegram.utils import helpers
@@ -43,15 +42,22 @@ def test_create_deep_linked_url(self):
 
         payload = ""
         expected = "https://t.me/{}".format(username)
-        assert expected == helpers.create_deep_linked_url(username, payload)
         assert expected == helpers.create_deep_linked_url(username)
+        assert expected == helpers.create_deep_linked_url(username, payload)
+        payload = None
+        assert expected == helpers.create_deep_linked_url(username, payload)
 
         with pytest.raises(ValueError):
             helpers.create_deep_linked_url(username, 'text with spaces')
 
         with pytest.raises(ValueError):
             helpers.create_deep_linked_url(username, '0' * 65)
 
+        with pytest.raises(ValueError):
+            helpers.create_deep_linked_url(None, None)
+        with pytest.raises(ValueError):  # too short username (4 is minimum)
+            helpers.create_deep_linked_url("abc", None)
+
     def test_effective_message_type(self):
         test_message = Message(message_id=1,
                                from_user=None,
