From 0e0e7f1c9e9ddc5e41c5378247bc53b90689f252 Mon Sep 17 00:00:00 2001 From: Lonami Exo Date: Sat, 3 Mar 2018 14:59:30 +0100 Subject: [PATCH] Avoid unnecessary "or 0" in the session classes --- telethon/sessions/memory.py | 4 ++-- telethon/sessions/sqlalchemy.py | 3 +-- telethon/sessions/sqlite.py | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/telethon/sessions/memory.py b/telethon/sessions/memory.py index df08bf22..e73e7688 100644 --- a/telethon/sessions/memory.py +++ b/telethon/sessions/memory.py @@ -29,7 +29,7 @@ class MemorySession(Session): def __init__(self): super().__init__() - self._dc_id = None + self._dc_id = 0 self._server_address = None self._port = None self._auth_key = None @@ -38,7 +38,7 @@ class MemorySession(Session): self._entities = set() def set_dc(self, dc_id, server_address, port): - self._dc_id = dc_id + self._dc_id = dc_id or 0 self._server_address = server_address self._port = port diff --git a/telethon/sessions/sqlalchemy.py b/telethon/sessions/sqlalchemy.py index 933f44c2..d4e72f16 100644 --- a/telethon/sessions/sqlalchemy.py +++ b/telethon/sessions/sqlalchemy.py @@ -129,8 +129,7 @@ class AlchemySession(MemorySession): self._auth_key = AuthKey(data=session.auth_key) def clone(self, to_instance=None): - cloned = to_instance or self.__class__(self.container, self.session_id) - return super().clone(cloned) + return super().clone(MemorySession()) def set_dc(self, dc_id, server_address, port): super().set_dc(dc_id, server_address, port) diff --git a/telethon/sessions/sqlite.py b/telethon/sessions/sqlite.py index 1170131e..c764cd21 100644 --- a/telethon/sessions/sqlite.py +++ b/telethon/sessions/sqlite.py @@ -198,7 +198,7 @@ class SQLiteSession(MemorySession): # multiple DCs. Probably done differently. c.execute('delete from sessions') c.execute('insert or replace into sessions values (?,?,?,?)', ( - self._dc_id or 0, + self._dc_id, self._server_address, self._port, self._auth_key.key if self._auth_key else b''