LonamiWebs/Telethon
1
1
Fork 0
mirror of https://github.com/LonamiWebs/Telethon.git synced 2024-11-23 01:46:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

Raise ImportError and not ValueError when sqlite3 is missing

Browse Source 
Excepting ValueError when creating the SQLiteSession could hide
other errors (e.g. using a newer session file on an older version
of the library). Instead, the original error is raised, as if
sqlite3 was being imported within its __init__ method.
This commit is contained in:
Lonami Exo 2019-02-13 08:51:26 +01:00
parent d25442345e
commit 47d9de98ed
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
telethon/client/telegrambaseclient.py
View File

@ -202,7 +202,7 @@ class TelegramBaseClient(abc.ABC):
if isinstance(session, str) or session is None: if isinstance(session, str) or session is None:
try: try:
session = SQLiteSession(session) session = SQLiteSession(session)
except ValueError: except ImportError:
import warnings import warnings
warnings.warn( warnings.warn(
'The sqlite3 module is not available under this ' 'The sqlite3 module is not available under this '

6
telethon/sessions/sqlite.py
View File

@ -14,8 +14,10 @@ from ..tl.types import (
try: try:
import sqlite3 import sqlite3
except ImportError: sqlite3_err = None
except ImportError as e:
sqlite3 = None sqlite3 = None
sqlite3_err = type(e)
EXTENSION = '.session' EXTENSION = '.session'
CURRENT_VERSION = 5 # database version CURRENT_VERSION = 5 # database version
@ -32,7 +34,7 @@ class SQLiteSession(MemorySession):
def __init__(self, session_id=None): def __init__(self, session_id=None):
if sqlite3 is None: if sqlite3 is None:
raise ValueError('sqlite3 is not installed') raise sqlite3_err
super().__init__() super().__init__()
self.filename = ':memory:' self.filename = ':memory:'