Merge pull request #930 from lucc/quantifycode-fixes

Fix some issues reported by quantifycode

3 files changed, 10 insertions, 9 deletions

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]
 
diff --git a/alot/widgets/thread.py b/alot/widgets/thread.py
index 29d5d7fe..a0aa16d3 100644
--- a/alot/widgets/thread.py
+++ b/alot/widgets/thread.py
@@ -360,22 +360,23 @@ 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):
+    @staticmethod
+    def position_of_messagetree(mt):
         return mt._message.get_message_id()
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',