Allow fall backs for moderation actions.

The `moderation_action` for members and nonmember can now be ``None``
which signals falling back to the appropriate list default action,
e.g. `default_member_action` and `default_nonmember_action`.  Given by
Aurélien Bompard.

Closes #189

2 files changed, 2 insertions, 2 deletions

diff --git a/src/mailman/utilities/importer.py b/src/mailman/utilities/importer.py
index 0d511b2c4..1f350205f 100644
--- a/src/mailman/utilities/importer.py
+++ b/src/mailman/utilities/importer.py
@@ -575,7 +575,7 @@ def import_roster(mlist, config_dict, members, role, action=None):
                 # The member is moderated.  Check the member_moderation_action
                 # option to know which action should be taken.
                 action = member_moderation_action_mapping(
-                    config_dict.get("member_moderation_action"))
+                    config_dict.get('member_moderation_action'))
             else:
                 # Member is not moderated: defer is the best option, as
                 # discussed on merge request 100.
diff --git a/src/mailman/utilities/tests/test_import.py b/src/mailman/utilities/tests/test_import.py
index f55debde5..b2d48891b 100644
--- a/src/mailman/utilities/tests/test_import.py
+++ b/src/mailman/utilities/tests/test_import.py
@@ -1112,7 +1112,7 @@ class TestPreferencesImport(unittest.TestCase):
         self._do_test(128, dict(moderation_action=Action.discard))
 
     def test_no_moderate(self):
-        # If option flag Moderate is not set, action is defer.
+        # If the option flag Moderate is not set, the action is defer.
         # See: https://gitlab.com/mailman/mailman/merge_requests/100
         self._pckdict['member_moderation_action'] = 1          # reject
         self._do_test(0, dict(moderation_action=Action.defer))