From 4e9a84c3b5458937d11b01775823ba1ed4c992af Mon Sep 17 00:00:00 2001 From: Lonami Exo Date: Mon, 18 Jun 2018 21:02:42 +0200 Subject: [PATCH] Remove underscore from module names --- .gitignore | 4 ++-- setup.py | 2 +- telethon/client/telegrambaseclient.py | 2 +- telethon/crypto/__init__.py | 6 +++--- telethon/crypto/{aes_ctr.py => aesctr.py} | 0 telethon/crypto/{auth_key.py => authkey.py} | 0 telethon/crypto/{cdn_decrypter.py => cdndecrypter.py} | 0 telethon/errors/__init__.py | 4 ++-- telethon/errors/{rpc_base_errors.py => rpcbaseerrors.py} | 0 telethon/extensions/__init__.py | 4 ++-- telethon/extensions/{binary_reader.py => binaryreader.py} | 2 +- telethon/extensions/{tcp_client.py => tcpclient.py} | 0 telethon/{update_state.py => updatestate.py} | 0 telethon_generator/{docs_writer.py => docswriter.py} | 0 .../{fetch_pwrtelegram.py => fetchpwrtelegram.py} | 0 telethon_generator/generators/docs.py | 2 +- telethon_generator/generators/errors.py | 5 +---- telethon_generator/generators/tlobject.py | 6 +++--- telethon_generator/{source_builder.py => sourcebuilder.py} | 0 19 files changed, 17 insertions(+), 20 deletions(-) rename telethon/crypto/{aes_ctr.py => aesctr.py} (100%) rename telethon/crypto/{auth_key.py => authkey.py} (100%) rename telethon/crypto/{cdn_decrypter.py => cdndecrypter.py} (100%) rename telethon/errors/{rpc_base_errors.py => rpcbaseerrors.py} (100%) rename telethon/extensions/{binary_reader.py => binaryreader.py} (99%) rename telethon/extensions/{tcp_client.py => tcpclient.py} (100%) rename telethon/{update_state.py => updatestate.py} (100%) rename telethon_generator/{docs_writer.py => docswriter.py} (100%) rename telethon_generator/{fetch_pwrtelegram.py => fetchpwrtelegram.py} (100%) rename telethon_generator/{source_builder.py => sourcebuilder.py} (100%) diff --git a/.gitignore b/.gitignore index c8b7b750..028bcce6 100755 --- a/.gitignore +++ b/.gitignore @@ -5,8 +5,8 @@ docs/ # Generated code telethon/tl/functions/ telethon/tl/types/ -telethon/tl/all_tlobjects.py -telethon/errors/rpc_error_list.py +telethon/tl/alltlobjects.py +telethon/errors/rpcerrorlist.py # User session *.session diff --git a/setup.py b/setup.py index a4ffd497..c7c8a07d 100755 --- a/setup.py +++ b/setup.py @@ -42,7 +42,7 @@ LIBRARY_DIR = 'telethon' ERRORS_IN_JSON = os.path.join(GENERATOR_DIR, 'data', 'errors.json') ERRORS_IN_DESC = os.path.join(GENERATOR_DIR, 'data', 'error_descriptions') -ERRORS_OUT = os.path.join(LIBRARY_DIR, 'errors', 'rpc_error_list.py') +ERRORS_OUT = os.path.join(LIBRARY_DIR, 'errors', 'rpcerrorlist.py') INVALID_BM_IN = os.path.join(GENERATOR_DIR, 'data', 'invalid_bot_methods.json') diff --git a/telethon/client/telegrambaseclient.py b/telethon/client/telegrambaseclient.py index 0d0f3c88..0c582659 100644 --- a/telethon/client/telegrambaseclient.py +++ b/telethon/client/telegrambaseclient.py @@ -14,7 +14,7 @@ from ..network import MTProtoSender, ConnectionTcpFull from ..network.mtprotostate import MTProtoState from ..sessions import Session, SQLiteSession from ..tl import TLObject, functions -from ..tl.all_tlobjects import LAYER +from ..tl.alltlobjects import LAYER DEFAULT_DC_ID = 4 DEFAULT_IPV4_IP = '149.154.167.51' diff --git a/telethon/crypto/__init__.py b/telethon/crypto/__init__.py index aa470adf..69be1da8 100644 --- a/telethon/crypto/__init__.py +++ b/telethon/crypto/__init__.py @@ -4,7 +4,7 @@ such as the AES IGE mode used by Telegram, the authorization key bound with their data centers, and so on. """ from .aes import AES -from .aes_ctr import AESModeCTR -from .auth_key import AuthKey +from .aesctr import AESModeCTR +from .authkey import AuthKey from .factorization import Factorization -from .cdn_decrypter import CdnDecrypter +from .cdndecrypter import CdnDecrypter diff --git a/telethon/crypto/aes_ctr.py b/telethon/crypto/aesctr.py similarity index 100% rename from telethon/crypto/aes_ctr.py rename to telethon/crypto/aesctr.py diff --git a/telethon/crypto/auth_key.py b/telethon/crypto/authkey.py similarity index 100% rename from telethon/crypto/auth_key.py rename to telethon/crypto/authkey.py diff --git a/telethon/crypto/cdn_decrypter.py b/telethon/crypto/cdndecrypter.py similarity index 100% rename from telethon/crypto/cdn_decrypter.py rename to telethon/crypto/cdndecrypter.py diff --git a/telethon/errors/__init__.py b/telethon/errors/__init__.py index bafaed70..c1c7a6b3 100644 --- a/telethon/errors/__init__.py +++ b/telethon/errors/__init__.py @@ -12,8 +12,8 @@ from .common import ( ) # This imports the base errors too, as they're imported there -from .rpc_base_errors import * -from .rpc_error_list import * +from .rpcbaseerrors import * +from .rpcerrorlist import * def report_error(code, message, report_method): diff --git a/telethon/errors/rpc_base_errors.py b/telethon/errors/rpcbaseerrors.py similarity index 100% rename from telethon/errors/rpc_base_errors.py rename to telethon/errors/rpcbaseerrors.py diff --git a/telethon/extensions/__init__.py b/telethon/extensions/__init__.py index 0e932eac..9e7f6686 100644 --- a/telethon/extensions/__init__.py +++ b/telethon/extensions/__init__.py @@ -3,5 +3,5 @@ Several extensions Python is missing, such as a proper class to handle a TCP communication with support for cancelling the operation, and an utility class to read arbitrary binary data in a more comfortable way, with int/strings/etc. """ -from .binary_reader import BinaryReader -from .tcp_client import TcpClient +from .binaryreader import BinaryReader +from .tcpclient import TcpClient diff --git a/telethon/extensions/binary_reader.py b/telethon/extensions/binaryreader.py similarity index 99% rename from telethon/extensions/binary_reader.py rename to telethon/extensions/binaryreader.py index b0027084..a138c255 100644 --- a/telethon/extensions/binary_reader.py +++ b/telethon/extensions/binaryreader.py @@ -7,7 +7,7 @@ from io import BufferedReader, BytesIO from struct import unpack from ..errors import TypeNotFoundError -from ..tl.all_tlobjects import tlobjects +from ..tl.alltlobjects import tlobjects from ..tl.core import core_objects diff --git a/telethon/extensions/tcp_client.py b/telethon/extensions/tcpclient.py similarity index 100% rename from telethon/extensions/tcp_client.py rename to telethon/extensions/tcpclient.py diff --git a/telethon/update_state.py b/telethon/updatestate.py similarity index 100% rename from telethon/update_state.py rename to telethon/updatestate.py diff --git a/telethon_generator/docs_writer.py b/telethon_generator/docswriter.py similarity index 100% rename from telethon_generator/docs_writer.py rename to telethon_generator/docswriter.py diff --git a/telethon_generator/fetch_pwrtelegram.py b/telethon_generator/fetchpwrtelegram.py similarity index 100% rename from telethon_generator/fetch_pwrtelegram.py rename to telethon_generator/fetchpwrtelegram.py diff --git a/telethon_generator/generators/docs.py b/telethon_generator/generators/docs.py index 9ccfc19c..2d51c326 100755 --- a/telethon_generator/generators/docs.py +++ b/telethon_generator/generators/docs.py @@ -5,7 +5,7 @@ import re import shutil from collections import defaultdict -from ..docs_writer import DocsWriter +from ..docswriter import DocsWriter from ..parsers import TLObject from ..utils import snake_to_camel_case diff --git a/telethon_generator/generators/errors.py b/telethon_generator/generators/errors.py index bc28d485..4ec5ac0b 100644 --- a/telethon_generator/generators/errors.py +++ b/telethon_generator/generators/errors.py @@ -1,6 +1,3 @@ -import itertools - - def generate_errors(errors, f): # Exact/regex match to create {CODE: ErrorClassName} exact_match = [] @@ -20,7 +17,7 @@ def generate_errors(errors, f): exact_match.append(error) # Imports and new subclass creation - f.write('from .rpc_base_errors import RPCError, {}\n' + f.write('from .rpcbaseerrors import RPCError, {}\n' .format(", ".join(sorted(import_base)))) for cls, int_code in sorted(create_base.items(), key=lambda t: t[1]): diff --git a/telethon_generator/generators/tlobject.py b/telethon_generator/generators/tlobject.py index c2c20ab8..ac8945b9 100644 --- a/telethon_generator/generators/tlobject.py +++ b/telethon_generator/generators/tlobject.py @@ -6,7 +6,7 @@ import struct from collections import defaultdict from zlib import crc32 -from ..source_builder import SourceBuilder +from ..sourcebuilder import SourceBuilder from ..utils import snake_to_camel_case AUTO_GEN_NOTICE = \ @@ -650,7 +650,7 @@ def generate_tlobjects(tlobjects, layer, import_depth, output_dir): _write_modules(get_file('types'), import_depth, 'TLObject', namespace_types, type_constructors) - filename = os.path.join(get_file('all_tlobjects.py')) + filename = os.path.join(get_file('alltlobjects.py')) with open(filename, 'w', encoding='utf-8') as file: with SourceBuilder(file) as builder: _write_all_tlobjects(tlobjects, layer, builder) @@ -663,6 +663,6 @@ def clean_tlobjects(output_dir): if os.path.isdir(d): shutil.rmtree(d) - tl = get_file('all_tlobjects.py') + tl = get_file('alltlobjects.py') if os.path.isfile(tl): os.remove(tl) diff --git a/telethon_generator/source_builder.py b/telethon_generator/sourcebuilder.py similarity index 100% rename from telethon_generator/source_builder.py rename to telethon_generator/sourcebuilder.py