Fix offset bug in Message._parse_*

Bibo-Joshi · Bibo-Joshi · commit 285cb372dc06 · 2020-02-15T10:57:01.000+01:00
diff --git a/telegram/message.py b/telegram/message.py
@@ -1036,7 +1036,7 @@ def parse_caption_entities(self, types=None):
         }
 
     @staticmethod
-    def _parse_html(message_text, entities, urled=False, offset=None):
+    def _parse_html(message_text, entities, urled=False, offset=0):
         if message_text is None:
             return None
 
@@ -1086,8 +1086,7 @@ def _parse_html(message_text, entities, urled=False, offset=None):
                 else:
                     insert = text
 
-                if offset is None:
-                    offset = 0
+                if offset == 0:
                     if sys.maxunicode == 0xffff:
                         html_text += escape(message_text[last_offset:entity.offset
                                                          - offset]) + insert
@@ -1104,7 +1103,7 @@ def _parse_html(message_text, entities, urled=False, offset=None):
 
                 last_offset = entity.offset - offset + entity.length
 
-        if offset is None:
+        if offset == 0:
             if sys.maxunicode == 0xffff:
                 html_text += escape(message_text[last_offset:])
             else:
@@ -1172,7 +1171,7 @@ def caption_html_urled(self):
         return self._parse_html(self.caption, self.parse_caption_entities(), urled=True)
 
     @staticmethod
-    def _parse_markdown(message_text, entities, urled=False, version=1, offset=None):
+    def _parse_markdown(message_text, entities, urled=False, version=1, offset=0):
         version = int(version)
 
         if message_text is None:
@@ -1242,8 +1241,7 @@ def _parse_markdown(message_text, entities, urled=False, version=1, offset=None)
                 else:
                     insert = text
 
-                if offset is None:
-                    offset = 0
+                if offset == 0:
                     if sys.maxunicode == 0xffff:
                         markdown_text += escape_markdown(message_text[last_offset:entity.offset
                                                                       - offset],
@@ -1262,7 +1260,7 @@ def _parse_markdown(message_text, entities, urled=False, version=1, offset=None)
 
                 last_offset = entity.offset - offset + entity.length
 
-        if offset is None:
+        if offset == 0:
             if sys.maxunicode == 0xffff:
                 markdown_text += escape_markdown(message_text[last_offset:], version=version)
             else:
diff --git a/tests/test_message.py b/tests/test_message.py
@@ -237,9 +237,9 @@ def test_text_markdown_simple(self):
 
     def test_text_markdown_v2_simple(self):
         test_md_string = (r'Test for <*bold*, _ita\_lic_, `\\\`code`, '
-                          '[links](http://github.com/abc\\\\\\)def), '
-                          '[text\-mention](tg://user?id=123456789) and ```\`\\\\pre```. '
-                          'http://google\.com and _bold *nested in ~strk~ nested in* italic_.')
+                          '[links](http://github.com/abc\\\\\)def), '
+                          '[text\-mention](tg://user?id=123456789) and ```\`\\\\pre```\. '
+                          'http://google\.com and _bold *nested in ~strk~ nested in* italic_\.')
         text_markdown = self.test_message_v2.text_markdown_v2
         assert text_markdown == test_md_string
 
@@ -258,10 +258,10 @@ def test_text_markdown_urled(self):
 
     def test_text_markdown_v2_urled(self):
         test_md_string = (r'Test for <*bold*, _ita\_lic_, `\\\`code`, '
-                          '[links](http://github.com/abc\\\\\\)def), '
-                          '[text\-mention](tg://user?id=123456789) and ```\`\\\\pre```. '
+                          '[links](http://github.com/abc\\\\\)def), '
+                          '[text\-mention](tg://user?id=123456789) and ```\`\\\\pre```\. '
                           '[http://google\.com](http://google.com) and _bold *nested in ~strk~ '
-                          'nested in* italic_.')
+                          'nested in* italic_\.')
         text_markdown = self.test_message_v2.text_markdown_v2_urled
         assert text_markdown == test_md_string
 
@@ -314,8 +314,8 @@ def test_caption_markdown_simple(self):
     def test_caption_markdown_v2_simple(self):
         test_md_string = (r'Test for <*bold*, _ita\_lic_, `\\\`code`, '
                           '[links](http://github.com/abc\\\\\\)def), '
-                          '[text\-mention](tg://user?id=123456789) and ```\`\\\\pre```. '
-                          'http://google\.com and _bold *nested in ~strk~ nested in* italic_.')
+                          '[text\-mention](tg://user?id=123456789) and ```\`\\\\pre```\. '
+                          'http://google\.com and _bold *nested in ~strk~ nested in* italic_\.')
         caption_markdown = self.test_message_v2.caption_markdown_v2
         assert caption_markdown == test_md_string
 
@@ -335,9 +335,9 @@ def test_caption_markdown_urled(self):
     def test_caption_markdown_v2_urled(self):
         test_md_string = (r'Test for <*bold*, _ita\_lic_, `\\\`code`, '
                           '[links](http://github.com/abc\\\\\\)def), '
-                          '[text\-mention](tg://user?id=123456789) and ```\`\\\\pre```. '
+                          '[text\-mention](tg://user?id=123456789) and ```\`\\\\pre```\. '
                           '[http://google\.com](http://google.com) and _bold *nested in ~strk~ '
-                          'nested in* italic_.')
+                          'nested in* italic_\.')
         caption_markdown = self.test_message_v2.caption_markdown_v2_urled
         assert caption_markdown == test_md_string
 
@@ -448,8 +448,8 @@ def test(*args, **kwargs):
                                       quote=True)
 
     def test_reply_markdown_v2(self, monkeypatch, message):
-        test_md_string = (r'Test for <*bold*, _ita\_lic_, `\\\\\`code`, '
-                          '[links](http://github.com/abc\\\\\\)def), '
+        test_md_string = (r'Test for <*bold*, _ita\_lic_, `\\\`code`, '
+                          '[links](http://github.com/abc\\\\\)def), '
                           '[text\-mention](tg://user?id=123456789) and ```\`\\\\pre```\. '
                           'http://google\.com and _bold *nested in ~strk~ nested in* italic_\.')
 
