From 4283ed919a73cd6af1743382b6d16afa3d21b875 Mon Sep 17 00:00:00 2001 From: Robin McCorkell Date: Sun, 15 Jan 2017 17:14:51 +0000 Subject: [PATCH 1/3] taskwarrior: Prevent KeyError on missing project --- i3pystatus/taskwarrior.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/i3pystatus/taskwarrior.py b/i3pystatus/taskwarrior.py index a5118d6..f8073de 100644 --- a/i3pystatus/taskwarrior.py +++ b/i3pystatus/taskwarrior.py @@ -80,7 +80,8 @@ class Taskwarrior(IntervalModule): if self.next_task is not None: format_values['next'] = self.next_task['description'] - format_values['project'] = self.next_task['project'] + format_values['project'] = self.next_task['project'] \ + if 'project' in self.next_task else '' self.output = { 'full_text': self.format.format(**format_values), From 6b487bbe810dfbbdde8ed222ab1bc2b182f00a74 Mon Sep 17 00:00:00 2001 From: Robin McCorkell Date: Mon, 16 Jan 2017 22:49:24 +0000 Subject: [PATCH 2/3] Fix style issues --- i3pystatus/taskwarrior.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/i3pystatus/taskwarrior.py b/i3pystatus/taskwarrior.py index f8073de..4ba5a7b 100644 --- a/i3pystatus/taskwarrior.py +++ b/i3pystatus/taskwarrior.py @@ -80,8 +80,8 @@ class Taskwarrior(IntervalModule): if self.next_task is not None: format_values['next'] = self.next_task['description'] - format_values['project'] = self.next_task['project'] \ - if 'project' in self.next_task else '' + format_values['project'] = (self.next_task['project'] if 'project' in self.next_task + else '') self.output = { 'full_text': self.format.format(**format_values), From 6292f4b3f08745801082a2950d246dfb4bf9942e Mon Sep 17 00:00:00 2001 From: Robin McCorkell Date: Mon, 23 Jan 2017 17:11:49 +0000 Subject: [PATCH 3/3] Replace if in then ... else ... with .get() --- i3pystatus/taskwarrior.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/i3pystatus/taskwarrior.py b/i3pystatus/taskwarrior.py index 4ba5a7b..275317b 100644 --- a/i3pystatus/taskwarrior.py +++ b/i3pystatus/taskwarrior.py @@ -80,8 +80,7 @@ class Taskwarrior(IntervalModule): if self.next_task is not None: format_values['next'] = self.next_task['description'] - format_values['project'] = (self.next_task['project'] if 'project' in self.next_task - else '') + format_values['project'] = self.next_task.get('project', '') self.output = { 'full_text': self.format.format(**format_values),