From 86a89282785e797b983b2f2b28b44a82378ceba0 Mon Sep 17 00:00:00 2001 From: Lonami Exo Date: Thu, 24 Jan 2019 11:02:58 +0100 Subject: [PATCH] Better error diagnostics and fix parsing errors.csv --- telethon_generator/data/errors.csv | 2 +- telethon_generator/parsers/errors.py | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/telethon_generator/data/errors.csv b/telethon_generator/data/errors.csv index 13ffa0c4..61669f8c 100644 --- a/telethon_generator/data/errors.csv +++ b/telethon_generator/data/errors.csv @@ -13,7 +13,7 @@ AUTH_KEY_INVALID,401,The key is invalid AUTH_KEY_PERM_EMPTY,401,"The method is unavailable for temporary authorization key, not bound to permanent" AUTH_KEY_UNREGISTERED,401,The key is not registered in the system AUTH_RESTART,500,Restart the authorization process -BANNED_RIGHTS_INVALID,400,You cannot use that set of permissions in this request, i.e. restricting view_messages as a default +BANNED_RIGHTS_INVALID,400,"You cannot use that set of permissions in this request, i.e. restricting view_messages as a default" BOTS_TOO_MUCH,400,There are too many bots in this chat/channel BOT_CHANNELS_NA,400,Bots can't edit admin privileges BOT_GROUPS_BLOCKED,400,This bot can't be added to groups diff --git a/telethon_generator/parsers/errors.py b/telethon_generator/parsers/errors.py index e583e844..d3d30c49 100644 --- a/telethon_generator/parsers/errors.py +++ b/telethon_generator/parsers/errors.py @@ -60,7 +60,13 @@ def parse_errors(csv_file): with csv_file.open(newline='') as f: f = csv.reader(f) next(f, None) # header - for line, (name, codes, description) in enumerate(f, start=2): + for line, tup in enumerate(f, start=2): + try: + name, codes, description = tup + except ValueError: + raise ValueError('Columns count mismatch, unquoted comma in ' + 'desc? (line {})'.format(line)) from None + try: codes = [int(x) for x in codes.split()] or [400] except ValueError: