OpenSource/python-telegram-bot
OpenSource/python-telegram-bot
1
0
Fork 0
mirror of https://github.com/python-telegram-bot/python-telegram-bot.git synced 2024-10-23 17:36:26 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fix Bug in BasePersistence.insert/replace_bot for Objects with __dict__ in their slots (#2561)

Browse source 
* Handle objects with __dict__ in __slots__

* Rework
This commit is contained in:
Bibo-Joshi 2021-06-13 15:07:40 +02:00 committed by GitHub
parent ac4768155f
commit 52ce03929b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
telegram/ext/basepersistence.py
View file

@ -276,11 +276,8 @@ class BasePersistence(Generic[UD, CD, BD], ABC):
new_obj[cls._replace_bot(k, memo)] = cls._replace_bot(val, memo)
memo[obj_id] = new_obj
return new_obj
if hasattr(obj, '__dict__'):
for attr_name, attr in new_obj.__dict__.items():
setattr(new_obj, attr_name, cls._replace_bot(attr, memo))
memo[obj_id] = new_obj
return new_obj
# if '__dict__' in obj.__slots__, we already cover this here, that's why the
# __dict__ case comes below
if hasattr(obj, '__slots__'):
for attr_name in new_obj.__slots__:
setattr(
@ -290,6 +287,11 @@ class BasePersistence(Generic[UD, CD, BD], ABC):
)
memo[obj_id] = new_obj
return new_obj
if hasattr(obj, '__dict__'):
for attr_name, attr in new_obj.__dict__.items():
setattr(new_obj, attr_name, cls._replace_bot(attr, memo))
memo[obj_id] = new_obj
return new_obj
return obj
@ -364,11 +366,8 @@ class BasePersistence(Generic[UD, CD, BD], ABC):
new_obj[self._insert_bot(k, memo)] = self._insert_bot(val, memo)
memo[obj_id] = new_obj
return new_obj
if hasattr(obj, '__dict__'):
for attr_name, attr in new_obj.__dict__.items():
setattr(new_obj, attr_name, self._insert_bot(attr, memo))
memo[obj_id] = new_obj
return new_obj
# if '__dict__' in obj.__slots__, we already cover this here, that's why the
# __dict__ case comes below
if hasattr(obj, '__slots__'):
for attr_name in obj.__slots__:
setattr(
@ -378,6 +377,11 @@ class BasePersistence(Generic[UD, CD, BD], ABC):
)
memo[obj_id] = new_obj
return new_obj
if hasattr(obj, '__dict__'):
for attr_name, attr in new_obj.__dict__.items():
setattr(new_obj, attr_name, self._insert_bot(attr, memo))
memo[obj_id] = new_obj
return new_obj
return obj

6
tests/test_persistence.py
View file

@ -561,14 +561,15 @@ class TestBasePersistence:
def test_bot_replace_insert_bot(self, bot, bot_persistence):
class CustomSlottedClass:
__slots__ = ('bot',)
__slots__ = ('bot', '__dict__')
def __init__(self):
self.bot = bot
self.not_in_dict = bot
def __eq__(self, other):
if isinstance(other, CustomSlottedClass):
return self.bot is other.bot
return self.bot is other.bot and self.not_in_dict is other.not_in_dict
return False
class CustomClass:
@ -587,6 +588,7 @@ class TestBasePersistence:
cc = CustomClass()
cc.bot = BasePersistence.REPLACED_BOT
cc.slotted_object.bot = BasePersistence.REPLACED_BOT
cc.slotted_object.not_in_dict = BasePersistence.REPLACED_BOT
cc.list_ = [1, 2, BasePersistence.REPLACED_BOT]
cc.tuple_ = tuple(cc.list_)
cc.set_ = set(cc.list_)