From f9cd0d7e081e4a29e0f19b596581931d96681d55 Mon Sep 17 00:00:00 2001
From: coder2020official <khumogo1@gmail.com>
Date: Mon, 2 May 2022 14:45:43 +0500
Subject: [PATCH] Avoid circular import

---
 telebot/asyncio_storage/memory_storage.py | 4 +---
 telebot/asyncio_storage/pickle_storage.py | 3 +--
 telebot/asyncio_storage/redis_storage.py  | 3 +--
 telebot/storage/memory_storage.py         | 3 +--
 telebot/storage/pickle_storage.py         | 3 +--
 telebot/storage/redis_storage.py          | 3 +--
 6 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/telebot/asyncio_storage/memory_storage.py b/telebot/asyncio_storage/memory_storage.py
index b4d8e16..45c2ad9 100644
--- a/telebot/asyncio_storage/memory_storage.py
+++ b/telebot/asyncio_storage/memory_storage.py
@@ -1,7 +1,5 @@
 from telebot.asyncio_storage.base_storage import StateStorageBase, StateContext
 
-from telebot.asyncio_handler_backends import State
-
 class StateMemoryStorage(StateStorageBase):
     def __init__(self) -> None:
         self.data = {}
@@ -10,7 +8,7 @@ class StateMemoryStorage(StateStorageBase):
     
     
     async def set_state(self, chat_id, user_id, state):
-        if isinstance(state, State):
+        if hasattr(state, 'name'):
             state = state.name
         if chat_id in self.data:
             if user_id in self.data[chat_id]:
diff --git a/telebot/asyncio_storage/pickle_storage.py b/telebot/asyncio_storage/pickle_storage.py
index fab8e81..4928d4a 100644
--- a/telebot/asyncio_storage/pickle_storage.py
+++ b/telebot/asyncio_storage/pickle_storage.py
@@ -1,7 +1,6 @@
 from telebot.asyncio_storage.base_storage import StateStorageBase, StateContext
 import os
 
-from telebot.asyncio_handler_backends import State
 import pickle
 
 
@@ -47,7 +46,7 @@ class StatePickleStorage(StateStorageBase):
         file.close()
 
     async def set_state(self, chat_id, user_id, state):
-        if isinstance(state, State):
+        if hasattr(state, 'name'):
             state = state.name
         if chat_id in self.data:
             if user_id in self.data[chat_id]:
diff --git a/telebot/asyncio_storage/redis_storage.py b/telebot/asyncio_storage/redis_storage.py
index e90c89f..0cf52b9 100644
--- a/telebot/asyncio_storage/redis_storage.py
+++ b/telebot/asyncio_storage/redis_storage.py
@@ -1,7 +1,6 @@
 from telebot.asyncio_storage.base_storage import StateStorageBase, StateContext
 import json
 
-from telebot.asyncio_handler_backends import State
 
 redis_installed = True
 try:
@@ -67,7 +66,7 @@ class StateRedisStorage(StateStorageBase):
         """
         response = await self.get_record(chat_id)
         user_id = str(user_id)
-        if isinstance(state, State):
+        if hasattr(state, 'name'):
             state = state.name
         if response:
             if user_id in response:
diff --git a/telebot/storage/memory_storage.py b/telebot/storage/memory_storage.py
index 73f4c4f..67cd984 100644
--- a/telebot/storage/memory_storage.py
+++ b/telebot/storage/memory_storage.py
@@ -1,6 +1,5 @@
 from telebot.storage.base_storage import StateStorageBase, StateContext
 
-from telebot.handler_backends import State
 
 class StateMemoryStorage(StateStorageBase):
     def __init__(self) -> None:
@@ -10,7 +9,7 @@ class StateMemoryStorage(StateStorageBase):
     
     
     def set_state(self, chat_id, user_id, state):
-        if isinstance(state, State):
+        if hasattr(state, 'name'):
             state = state.name
         if chat_id in self.data:
             if user_id in self.data[chat_id]:
diff --git a/telebot/storage/pickle_storage.py b/telebot/storage/pickle_storage.py
index 0a56907..39b10a3 100644
--- a/telebot/storage/pickle_storage.py
+++ b/telebot/storage/pickle_storage.py
@@ -1,6 +1,5 @@
 from telebot.storage.base_storage import StateStorageBase, StateContext
 import os
-from telebot.handler_backends import State
 
 import pickle
 
@@ -53,7 +52,7 @@ class StatePickleStorage(StateStorageBase):
         file.close()
 
     def set_state(self, chat_id, user_id, state):
-        if isinstance(state, State):
+        if hasattr(state, 'name'):
             state = state.name
         if chat_id in self.data:
             if user_id in self.data[chat_id]:
diff --git a/telebot/storage/redis_storage.py b/telebot/storage/redis_storage.py
index e46c6f6..23a1f43 100644
--- a/telebot/storage/redis_storage.py
+++ b/telebot/storage/redis_storage.py
@@ -1,7 +1,6 @@
 from pyclbr import Class
 from telebot.storage.base_storage import StateStorageBase, StateContext
 import json
-from telebot.handler_backends import State
 
 redis_installed = True
 try:
@@ -66,7 +65,7 @@ class StateRedisStorage(StateStorageBase):
         """
         response = self.get_record(chat_id)
         user_id = str(user_id)
-        if isinstance(state, State):
+        if hasattr(state, 'name'):
             state = state.name
 
         if response: