Members and nonmembers moderation action fallback

Members and nonmember's moderation action should be None by default, and
in that case the moderation rule should fallback to the mailing list's
default action.

Fixes: #189

2 files changed, 3 insertions, 4 deletions

diff --git a/src/mailman/utilities/importer.py b/src/mailman/utilities/importer.py
index 9a5684d9c..da19613d8 100644
--- a/src/mailman/utilities/importer.py
+++ b/src/mailman/utilities/importer.py
@@ -576,8 +576,6 @@ def import_roster(mlist, config_dict, members, role, action=None):
                 # option to know which action should be taken.
                 action = member_moderation_action_mapping(
                     config_dict.get("member_moderation_action"))
-            else:
-                action = Action.accept
         if action is not None:
             # Either this was set right above or in the function's arguments
             # for nonmembers.
diff --git a/src/mailman/utilities/tests/test_import.py b/src/mailman/utilities/tests/test_import.py
index 637f78585..83161bf1f 100644
--- a/src/mailman/utilities/tests/test_import.py
+++ b/src/mailman/utilities/tests/test_import.py
@@ -1112,9 +1112,10 @@ 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 accept
+        # If option flag Moderate is not set, action is None (fallback to the
+        # mailing list's action).
         self._pckdict['member_moderation_action'] = 1          # reject
-        self._do_test(0, dict(moderation_action=Action.accept))
+        self._do_test(0, dict(moderation_action=None))
 
     def test_multiple_options(self):
         # DontReceiveDuplicates & DisableMime & SuppressPasswordReminder