LonamiWebs/Telethon
1
1
Fork 0
mirror of https://github.com/LonamiWebs/Telethon.git synced 2024-11-29 04:43:45 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix importing dependencies during installing (#384)

Browse Source
This commit is contained in:
Andrei Fokau 2017-10-28 12:21:07 +02:00 committed by Lonami
parent e48f15be80
commit ef794bf75d
4 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
setup.py
View File

@ -15,16 +15,11 @@ Extra supported commands are:
from codecs import open from codecs import open
from sys import argv from sys import argv
import os import os
import re
# Always prefer setuptools over distutils # Always prefer setuptools over distutils
from setuptools import find_packages, setup from setuptools import find_packages, setup
try:
from telethon import TelegramClient
except Exception as e:
print('Failed to import TelegramClient due to', e)
TelegramClient = None
class TempWorkDir: class TempWorkDir:
"""Switches the working directory to be the one on which this file lives, """Switches the working directory to be the one on which this file lives,
@ -94,21 +89,15 @@ def main():
fetch_errors(ERRORS_JSON) fetch_errors(ERRORS_JSON)
else: else:
if not TelegramClient:
gen_tl()
from telethon import TelegramClient as TgClient
version = TgClient.__version__
else:
version = TelegramClient.__version__
# Get the long description from the README file # Get the long description from the README file
with open('README.rst', encoding='utf-8') as f: with open('README.rst', encoding='utf-8') as f:
long_description = f.read() long_description = f.read()
with open('telethon/version.py', encoding='utf-8') as f:
version = re.search(r"^__version__\s+=\s+'(.*)'$",
f.read(), flags=re.MULTILINE).group(1)
setup( setup(
name='Telethon', name='Telethon',
# Versions should comply with PEP440.
version=version, version=version,
description="Full-featured Telegram client library for Python 3", description="Full-featured Telegram client library for Python 3",
long_description=long_description, long_description=long_description,

5
telethon/__init__.py
View File

@ -1,4 +1,7 @@
from .telegram_bare_client import TelegramBareClient from .telegram_bare_client import TelegramBareClient
from .telegram_client import TelegramClient from .telegram_client import TelegramClient
from .network import ConnectionMode from .network import ConnectionMode
from . import tl from . import tl, version
__version__ = version.__version__

4
telethon/telegram_bare_client.py
View File

@ -9,7 +9,7 @@ from signal import signal, SIGINT, SIGTERM, SIGABRT
from threading import Lock from threading import Lock
from time import sleep from time import sleep
from . import helpers as utils from . import helpers as utils, version
from .crypto import rsa, CdnDecrypter from .crypto import rsa, CdnDecrypter
from .errors import ( from .errors import (
RPCError, BrokenAuthKeyError, ServerError, RPCError, BrokenAuthKeyError, ServerError,
@ -60,7 +60,7 @@ class TelegramBareClient:
""" """
# Current TelegramClient version # Current TelegramClient version
__version__ = '0.15.3' __version__ = version.__version__
# TODO Make this thread-safe, all connections share the same DC # TODO Make this thread-safe, all connections share the same DC
_config = None # Server configuration (with .dc_options) _config = None # Server configuration (with .dc_options)

3
telethon/version.py Normal file
View File

@ -0,0 +1,3 @@
# Versions should comply with PEP440.
# This line is parsed in setup.py:
__version__ = '0.15.3'