From f31ad72f921f84d31ab664c4e53366af7eef57fd Mon Sep 17 00:00:00 2001 From: Tobin Date: Tue, 7 Apr 2015 01:37:11 -0500 Subject: [PATCH] catch key error, omit extra notifications --- rtv/page.py | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/rtv/page.py b/rtv/page.py index 8d8f775..c129f64 100644 --- a/rtv/page.py +++ b/rtv/page.py @@ -257,9 +257,15 @@ class BasePage(object): """ Delete a submission or comment. """ - data = self.content.get(self.nav.absolute_index) - if data['author'] != self.reddit.user.name: - show_notification(self.stdscr, ['You can\'t delete this']) + if not self.reddit.is_logged_in(): + show_notification(self.stdscr, ['Login to delete']) + return + + try: + data = self.content.get(self.nav.absolute_index) + if data['author'] != self.reddit.user.name: + return + except KeyError: return prompt = 'Are you sure you want to delete this? (y/n):' @@ -282,9 +288,15 @@ class BasePage(object): """ Edit a submission or comment. """ - data = self.content.get(self.nav.absolute_index) - if data['author'] != self.reddit.user.name: - show_notification(self.stdscr, ['You can\'t edit this']) + if not self.reddit.is_logged_in(): + show_notification(self.stdscr, ['Login to edit']) + return + + try: + data = self.content.get(self.nav.absolute_index) + if data['author'] != self.reddit.user.name: + return + except KeyError: return if data['type'] == 'Submission':