Merge branch '0.3.6-feature-abooks'

1 files changed, 6 insertions, 3 deletions

diff --git a/alot/settings/manager.py b/alot/settings/manager.py
index 66c8e355..9dfe52b0 100644
--- a/alot/settings/manager.py
+++ b/alot/settings/manager.py
@@ -9,7 +9,8 @@ import logging
 from configobj import ConfigObj, Section
 
 from alot.account import SendmailAccount
-from alot.addressbooks import MatchSdtoutAddressbook, AbookAddressBook
+from alot.addressbook.abook import AbookAddressBook
+from alot.addressbook.external import ExternalAddressbook
 from alot.helper import pretty_datetime, string_decode
 
 from errors import ConfigError
@@ -127,8 +128,10 @@ class SettingsManager(object):
                     cmd = abook['command']
                     regexp = abook['regexp']
                     if cmd is not None and regexp is not None:
-                        args['abook'] = MatchSdtoutAddressbook(cmd,
-                                                               match=regexp)
+                        ef = abook['shellcommand_external_filtering']
+                        args['abook'] = ExternalAddressbook(cmd,
+                                                            regexp,
+                                                            external_filtering=ef)
                     else:
                         msg = 'underspecified abook of type \'shellcommand\':'
                         msg += '\ncommand: %s\nregexp:%s' % (cmd, regexp)