From dfe697ac171103e34b2aa90fe8e8d0ead09a9ef7 Mon Sep 17 00:00:00 2001 From: Lucas Hoffmann Date: Sat, 17 Dec 2016 15:09:32 +0100 Subject: Simplify arithmetic comparison --- alot/helper.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/alot/helper.py b/alot/helper.py index ba68bd45..9264e785 100644 --- a/alot/helper.py +++ b/alot/helper.py @@ -133,7 +133,7 @@ def string_decode(string, enc='ascii'): def shorten(string, maxlen): """shortens string if longer than maxlen, appending ellipsis""" - if maxlen > 1 and len(string) > maxlen: + if 1 < maxlen < len(string): string = string[:maxlen - 1] + u'\u2026' return string[:maxlen] -- cgit v1.2.3 From 54dbc06f42f32ba2e7c33a26d21bb5415e966c14 Mon Sep 17 00:00:00 2001 From: Lucas Hoffmann Date: Sat, 17 Dec 2016 15:37:55 +0100 Subject: Use cls as first argument to classmethods --- docs/source/conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/conf.py b/docs/source/conf.py index a2751b70..f1df2bb4 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -21,7 +21,7 @@ class Mock(object): class MockModule(object): @classmethod - def __getattr__(self, name): + def __getattr__(cls, name): return Mock if name not in ('__file__', '__path__') else '/dev/null' MOCK_MODULES = ['twisted', 'twisted.internet', -- cgit v1.2.3 From 75fefd295e76181e8c1072c94213f19aad206da8 Mon Sep 17 00:00:00 2001 From: Lucas Hoffmann Date: Sat, 17 Dec 2016 15:41:54 +0100 Subject: Remove redundant None argument in dict.get() --- alot/widgets/thread.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/alot/widgets/thread.py b/alot/widgets/thread.py index 29d5d7fe..80bc5833 100644 --- a/alot/widgets/thread.py +++ b/alot/widgets/thread.py @@ -360,22 +360,22 @@ class ThreadTree(Tree): # Tree API def __getitem__(self, pos): - return self._message.get(pos, None) + return self._message.get(pos) def parent_position(self, pos): - return self._parent_of.get(pos, None) + return self._parent_of.get(pos) def first_child_position(self, pos): - return self._first_child_of.get(pos, None) + return self._first_child_of.get(pos) def last_child_position(self, pos): - return self._last_child_of.get(pos, None) + return self._last_child_of.get(pos) def next_sibling_position(self, pos): - return self._next_sibling_of.get(pos, None) + return self._next_sibling_of.get(pos) def prev_sibling_position(self, pos): - return self._prev_sibling_of.get(pos, None) + return self._prev_sibling_of.get(pos) def position_of_messagetree(self, mt): return mt._message.get_message_id() -- cgit v1.2.3 From 76d5a99bd6c862d9092f8a93de81b0043a83b73d Mon Sep 17 00:00:00 2001 From: Lucas Hoffmann Date: Sat, 17 Dec 2016 15:42:25 +0100 Subject: Turn method into static method --- alot/widgets/thread.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/alot/widgets/thread.py b/alot/widgets/thread.py index 80bc5833..a0aa16d3 100644 --- a/alot/widgets/thread.py +++ b/alot/widgets/thread.py @@ -377,5 +377,6 @@ class ThreadTree(Tree): def prev_sibling_position(self, pos): return self._prev_sibling_of.get(pos) - def position_of_messagetree(self, mt): + @staticmethod + def position_of_messagetree(mt): return mt._message.get_message_id() -- cgit v1.2.3