Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion telebot/formatting.py
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,9 @@ def mcode(content: str, language: str="", escape: Optional[bool]=True) -> str:
:return: The formatted string.
:rtype: :obj:`str`
"""
return '```{}\n{}```'.format(language, escape_markdown(content) if escape else content)
if escape:
content = re.sub(r"([`\\])", r"\\\1", content)
return '```{}\n{}```'.format(language, content)


def hcode(content: str, escape: Optional[bool]=True) -> str:
Expand Down
21 changes: 20 additions & 1 deletion tests/test_formatting.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,10 @@

from html.parser import HTMLParser

import pytest

from telebot import types
from telebot.formatting import apply_html_entities, hpre
from telebot.formatting import apply_html_entities, hpre, mcode


class AttributeCollector(HTMLParser):
Expand Down Expand Up @@ -87,3 +89,20 @@ def test_apply_html_entities_escapes_pre_language():
def test_apply_html_entities_still_escapes_content():
entity = types.MessageEntity(type="bold", offset=0, length=4)
assert apply_html_entities("a<b> c", [entity]) == "<b>a&lt;b&gt;</b> c"


@pytest.mark.parametrize('content, escaped', [
(r'C:\code\_file.py', r'C:\\code\\_file.py'),
(r'\*', r'\\*'),
(r'\`', r'\\\`'),
('`value`', r'\`value\`'),
('trailing\\', 'trailing\\\\'),
('plain text\nsecond line', 'plain text\nsecond line'),
])
def test_mcode_escapes_code_content(content, escaped):
assert mcode(content, language='python') == '```python\n' + escaped + '```'


def test_mcode_can_disable_escaping():
content = r'\* `value`'
assert mcode(content, escape=False) == '```\n' + content + '```'
Loading