Merge pull request #2017 from Artin-GH/patch-1

Fix backslash (\) issue in escape_markdown

telebot/asyncio_storage/redis_storage.py

@@ -1,10 +1,11 @@
 from telebot.asyncio_storage.base_storage import StateStorageBase, StateContext
 import json
 
-
 redis_installed = True
+is_actual_aioredis = False
 try:
     import aioredis
+    is_actual_aioredis = True
 except ImportError:
     try:
         from redis import asyncio as aioredis
@@ -23,7 +24,7 @@ class StateRedisStorage(StateStorageBase):
         if not redis_installed:
             raise ImportError('AioRedis is not installed. Install it via "pip install aioredis"')
 
-
+        if is_actual_aioredis:
             aioredis_version = tuple(map(int, aioredis.__version__.split(".")[0]))
             if aioredis_version < (2,):
                 raise ImportError('Invalid aioredis version. Aioredis version should be >= 2.0.0')

telebot/formatting.py

@@ -61,8 +61,8 @@ def escape_markdown(content: str) -> str:
     :rtype: :obj:`str`
     """
     
-    parse = re.sub(r"([_*\[\]()~`>\#\+\-=|\.!\{\}])", r"\\\1", content)
-    reparse = re.sub(r"\\\\([_*\[\]()~`>\#\+\-=|\.!\{\}])", r"\1", parse)
+    parse = re.sub(r"([_*\[\]()~`>\#\+\-=|\.!\{\}\\])", r"\\\1", content)
+    reparse = re.sub(r"\\\\([_*\[\]()~`>\#\+\-=|\.!\{\}\\])", r"\1", parse)
     return reparse