Fix Empty Captions not Being Passed by Bot.copy_message (python-telegram-bot#2651)

DonalDuck004 · web-flow · commit a25c76e6a3b7 · 2021-09-09T07:50:04.000+02:00
diff --git a/AUTHORS.rst b/AUTHORS.rst
@@ -39,6 +39,7 @@ The following wonderful people contributed directly or indirectly to this projec
 - `daimajia <https://github.com/daimajia>`_
 - `Daniel Reed <https://github.com/nmlorg>`_
 - `D David Livingston <https://github.com/daviddl9>`_
+- `DonalDuck004 <https://github.com/DonalDuck004>`_
 - `Eana Hufwe <https://github.com/blueset>`_
 - `Ehsan Online <https://github.com/ehsanonline>`_
 - `Eli Gao <https://github.com/eligao>`_
diff --git a/telegram/bot.py b/telegram/bot.py
@@ -5296,7 +5296,7 @@ def copy_message(
             'disable_notification': disable_notification,
             'allow_sending_without_reply': allow_sending_without_reply,
         }
-        if caption:
+        if caption is not None:
             data['caption'] = caption
         if caption_entities:
             data['caption_entities'] = caption_entities
diff --git a/tests/test_bot.py b/tests/test_bot.py
@@ -2024,7 +2024,8 @@ def assertion(url, data, *args, **kwargs):
 
     @flaky(3, 1)
     @pytest.mark.parametrize('json_keyboard', [True, False])
-    def test_copy_message(self, monkeypatch, bot, chat_id, media_message, json_keyboard):
+    @pytest.mark.parametrize('caption', ["<b>Test</b>", '', None])
+    def test_copy_message(self, monkeypatch, bot, chat_id, media_message, json_keyboard, caption):
         keyboard = InlineKeyboardMarkup(
             [[InlineKeyboardButton(text="test", callback_data="test2")]]
         )
@@ -2033,7 +2034,7 @@ def post(url, data, timeout):
             assert data["chat_id"] == chat_id
             assert data["from_chat_id"] == chat_id
             assert data["message_id"] == media_message.message_id
-            assert data["caption"] == "<b>Test</b>"
+            assert data.get("caption") == caption
             assert data["parse_mode"] == ParseMode.HTML
             assert data["reply_to_message_id"] == media_message.message_id
             assert data["reply_markup"] == keyboard.to_json()
@@ -2046,7 +2047,7 @@ def post(url, data, timeout):
             chat_id,
             from_chat_id=chat_id,
             message_id=media_message.message_id,
-            caption="<b>Test</b>",
+            caption=caption,
             caption_entities=[MessageEntity(MessageEntity.BOLD, 0, 4)],
             parse_mode=ParseMode.HTML,
             reply_to_message_id=media_message.message_id,

Original file line number	Diff line number	Diff line change
`@@ -5296,7 +5296,7 @@ def copy_message(`
`5296`	`5296`	`'disable_notification': disable_notification,`
`5297`	`5297`	`'allow_sending_without_reply': allow_sending_without_reply,`
`5298`	`5298`	`}`
`5299`		`- if caption:`
	`5299`	`+ if caption is not None:`
`5300`	`5300`	`data['caption'] = caption`
`5301`	`5301`	`if caption_entities:`
`5302`	`5302`	`data['caption_entities'] = caption_entities`