X-Git-Url: https://git.madduck.net/etc/offlineimap.git/blobdiff_plain/18dccff4f2dfa0a3e963d34bc5f463b36d773798..a9d2139bc5facb84db13a457be1f38406d41d59d:/.offlineimap/helper.py

diff --git a/.offlineimap/helper.py b/.offlineimap/helper.py
index 8115898..d758d95 100644
--- a/.offlineimap/helper.py
+++ b/.offlineimap/helper.py
@@ -2,10 +2,10 @@
 
 import re
 
-base_excludes = ['delayed', 'outgoing', 'Trash', 'Queue', 'inbox']
+base_excludes = ['delayed', 'outgoing', 'Trash', 'Queue', 'inbox', 'Spam', 'Sent', 'Drafts']
 base_excludes_re = [ '[Ss]ent.*' ]
 full_excludes_re = ['discard', 'spool', 'spam', 'store/.+']
-prioritised = ['outgoing','resubmit','drafts','inbox','ardex','kbkg','toni','tahi','debian','mtfk','admin','retrain']
+prioritised = ['resubmit','drafts','inbox','ardex','kbkg','toni','tahi','debian','mtfk','admin','retrain']
 deprioritised = ['discard','spam','store','spool']
 
 def py_foldersort_main(x, y):
@@ -19,7 +19,7 @@ def py_foldersort_main(x, y):
             return +1
         elif y.startswith(prefix):
             return -1
-    return cmp(x, y)
+    return (x > y) - (x < y)
 
 def py_nametrans(x):
     return re.sub('^INBOX', 'inbox', x)
@@ -49,6 +49,6 @@ def py_folderfilter_bulk(x):
     return False
 
 def py_folderfilter_mbnames(acct, x):
-    full_excludes_re_mbnames = ['retrain/(sp|h)am'] + full_excludes_re
+    full_excludes_re_mbnames = ['retrain(/(sp|h)am)?$'] + full_excludes_re
     return acct in ['madduck.net', 'madduck.net_bulk'] \
             and not re.search('^(' + '|'.join(full_excludes_re_mbnames) + ')', x)