diff --git a/telethon/_network/connection/connection.py b/telethon/_network/connection/connection.py index 4570180d..abf398ee 100644 --- a/telethon/_network/connection/connection.py +++ b/telethon/_network/connection/connection.py @@ -263,15 +263,14 @@ class Connection(abc.ABC): if self._writer: self._writer.close() - if sys.version_info >= (3, 7): - try: - await self._writer.wait_closed() - except Exception as e: - # Disconnecting should never raise. Seen: - # * OSError: No route to host and - # * OSError: [Errno 32] Broken pipe - # * ConnectionResetError - self._log.info('%s during disconnect: %s', type(e), e) + try: + await self._writer.wait_closed() + except Exception as e: + # Disconnecting should never raise. Seen: + # * OSError: No route to host and + # * OSError: [Errno 32] Broken pipe + # * ConnectionResetError + self._log.info('%s during disconnect: %s', type(e), e) def send(self, data): """ diff --git a/telethon/errors/__init__.py b/telethon/errors/__init__.py index 152e7823..0d4ea0cc 100644 --- a/telethon/errors/__init__.py +++ b/telethon/errors/__init__.py @@ -1,5 +1,3 @@ -import sys - from ._custom import ( ReadCancelledError, TypeNotFoundError, @@ -25,24 +23,6 @@ from ._rpcbase import ( _mk_error_type ) -if sys.version_info < (3, 7): - # https://stackoverflow.com/a/7668273/ - class _TelethonErrors: - def __init__(self, _mk_error_type, everything): - self._mk_error_type = _mk_error_type - self.__dict__.update({ - k: v - for k, v in everything.items() - if isinstance(v, type) and issubclass(v, Exception) - }) - - def __getattr__(self, name): - return self._mk_error_type(name=name) - - sys.modules[__name__] = _TelethonErrors(_mk_error_type, globals()) -else: - # https://www.python.org/dev/peps/pep-0562/ - def __getattr__(name): - return _mk_error_type(name=name) - -del sys +# https://www.python.org/dev/peps/pep-0562/ +def __getattr__(name): + return _mk_error_type(name=name)