From 07de73bde1c4b6cc6d8b68d1acaf55f34cc2bc43 Mon Sep 17 00:00:00 2001 From: Alexander Graf <17130992+aandergr@users.noreply.github.com> Date: Tue, 15 Jun 2021 21:05:08 +0200 Subject: [PATCH] Fix missing 2FA error message --- instaloader/__main__.py | 3 ++- instaloader/instaloader.py | 3 ++- instaloader/instaloadercontext.py | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/instaloader/__main__.py b/instaloader/__main__.py index 4bce9be..32a66d6 100644 --- a/instaloader/__main__.py +++ b/instaloader/__main__.py @@ -108,7 +108,8 @@ def _main(instaloader: Instaloader, targetlist: List[str], code = input("Enter 2FA verification code: ") instaloader.two_factor_login(code) break - except BadCredentialsException: + except BadCredentialsException as err: + print(err, file=sys.stderr) pass else: instaloader.interactive_login(username) diff --git a/instaloader/instaloader.py b/instaloader/instaloader.py index 589d2c0..f4561d2 100644 --- a/instaloader/instaloader.py +++ b/instaloader/instaloader.py @@ -1392,5 +1392,6 @@ class Instaloader: code = input("Enter 2FA verification code: ") self.two_factor_login(code) break - except BadCredentialsException: + except BadCredentialsException as err: + print(err, file=sys.stderr) pass diff --git a/instaloader/instaloadercontext.py b/instaloader/instaloadercontext.py index 506c7f3..8234e96 100644 --- a/instaloader/instaloadercontext.py +++ b/instaloader/instaloadercontext.py @@ -283,9 +283,9 @@ class InstaloaderContext: resp_json = login.json() if resp_json['status'] != 'ok': if 'message' in resp_json: - raise BadCredentialsException("Login error: {}".format(resp_json['message'])) + raise BadCredentialsException("2FA error: {}".format(resp_json['message'])) else: - raise BadCredentialsException("Login error: \"{}\" status.".format(resp_json['status'])) + raise BadCredentialsException("2FA error: \"{}\" status.".format(resp_json['status'])) session.headers.update({'X-CSRFToken': login.cookies['csrftoken']}) self._session = session self.username = user