From 0fdae713a5e80ae475abfd589601a09c511561e4 Mon Sep 17 00:00:00 2001 From: Shawn Hind Date: Fri, 6 Mar 2015 14:48:13 -0500 Subject: [PATCH 1/2] Fix bug with login where invalid password throws unhandeled exception in issue #24 --- rtv/main.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/rtv/main.py b/rtv/main.py index 8f7ccd5..c953d3d 100644 --- a/rtv/main.py +++ b/rtv/main.py @@ -2,6 +2,7 @@ import argparse from getpass import getpass import praw from requests.exceptions import ConnectionError, HTTPError +from praw.errors import InvalidUserPass from rtv.errors import SubmissionURLError, SubredditNameError from rtv.utils import curses_session, load_config @@ -94,6 +95,9 @@ def main(): page = SubredditPage(stdscr, reddit, args.subreddit) page.loop() + except InvalidUserPass: + print('Invalid password for username: ' + args.username) + except KeyboardInterrupt: return From 3379a99e0d9502d9205dc30e69fc56f585dc7a25 Mon Sep 17 00:00:00 2001 From: Shawn Hind Date: Fri, 6 Mar 2015 15:15:44 -0500 Subject: [PATCH 2/2] Fixed formatting of error message to be in line with others --- rtv/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rtv/main.py b/rtv/main.py index c953d3d..f59f4ec 100644 --- a/rtv/main.py +++ b/rtv/main.py @@ -96,7 +96,7 @@ def main(): page.loop() except InvalidUserPass: - print('Invalid password for username: ' + args.username) + print('Invalid password for username: {}'.format(args.username)) except KeyboardInterrupt: return