Revert "Fix values to methods in __main__"

This reverts commit 581ed2987bd456d2894637a30bb5a14a4caa5f9b.

Fixes #942

1 files changed, 4 insertions, 8 deletions

diff --git a/alot/__main__.py b/alot/__main__.py
index 829983c5..00b34c4e 100644
--- a/alot/__main__.py
+++ b/alot/__main__.py
@@ -60,8 +60,8 @@ class ComposeOptions(SubcommandOptions):
 class SearchOptions(SubcommandOptions):
     accepted = ['oldest_first', 'newest_first', 'message_id', 'unsorted']
 
-    def colourint(self, val):
-        if val not in self.accepted:
+    def colourint(val):
+        if val not in accepted:
             raise ValueError("Unknown sort order")
         return val
     colourint.coerceDoc = "Must be one of " + str(accepted)
@@ -73,18 +73,14 @@ class SearchOptions(SubcommandOptions):
 class Options(usage.Options):
     optFlags = [["read-only", "r", 'open db in read only mode'], ]
 
-    # Should be static method, except static methods are slotted and cannot
-    # have arbitrary attributes attached
-    def colourint(self, val):
+    def colourint(val):
         val = int(val)
         if val not in [1, 16, 256]:
             raise ValueError("Not in range")
         return val
     colourint.coerceDoc = "Must be 1, 16 or 256"
 
-    # Should be static method, except static methods are slotted and cannot
-    # have arbitrary attributes attached
-    def debuglogstring(self, val):
+    def debuglogstring(val):
         if val not in ['error', 'debug', 'info', 'warning']:
             raise ValueError("Not in range")
         return val