diff options
| author | Jim Popovitch <jimpop@gmail.com> | 2013-11-23 20:36:38 +0000 |
|---|---|---|
| committer | Jim Popovitch <jimpop@gmail.com> | 2013-11-23 20:36:38 +0000 |
| commit | f00ecb3432578156b7f9df2ae33ad5f840e20de6 (patch) | |
| tree | 9e17227aea58498eabc7f2829f41ccd2751d0f2e /Mailman | |
| parent | 06d15b0a9949652f696d19903cef2a235ff3a428 (diff) | |
| parent | f299ca620f3f5a8d2417f8779d3a208cdee1d3c5 (diff) | |
| download | mailman2-f00ecb3432578156b7f9df2ae33ad5f840e20de6.tar.gz mailman2-f00ecb3432578156b7f9df2ae33ad5f840e20de6.tar.xz mailman2-f00ecb3432578156b7f9df2ae33ad5f840e20de6.zip | |
Upstream changes
Diffstat (limited to 'Mailman')
| -rw-r--r-- | Mailman/Handlers/Moderate.py | 6 | ||||
| -rw-r--r-- | Mailman/Version.py | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/Mailman/Handlers/Moderate.py b/Mailman/Handlers/Moderate.py index 9b5f0600..884030de 100644 --- a/Mailman/Handlers/Moderate.py +++ b/Mailman/Handlers/Moderate.py @@ -1,4 +1,4 @@ -# Copyright (C) 2001-2011 by the Free Software Foundation, Inc. +# Copyright (C) 2001-2013 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -47,7 +47,7 @@ class ModeratedMemberPost(Hold.ModeratedPost): def process(mlist, msg, msgdata): - if msgdata.get('approved') or msgdata.get('fromusenet'): + if msgdata.get('approved'): return # First of all, is the poster a member or not? for sender in msg.get_senders(): @@ -124,7 +124,7 @@ def process(mlist, msg, msgdata): # moderation configuration variables. Handle by way of generic non-member # action. assert 0 <= mlist.generic_nonmember_action <= 4 - if mlist.generic_nonmember_action == 0: + if mlist.generic_nonmember_action == 0 or msgdata.get('fromusenet'): # Accept return elif mlist.generic_nonmember_action == 1: diff --git a/Mailman/Version.py b/Mailman/Version.py index 1df71cdd..8897164f 100644 --- a/Mailman/Version.py +++ b/Mailman/Version.py @@ -16,7 +16,7 @@ # USA. # Mailman version -VERSION = '2.1.16' +VERSION = '2.1.17' # And as a hex number in the manner of PY_VERSION_HEX ALPHA = 0xa @@ -28,7 +28,7 @@ FINAL = 0xf MAJOR_REV = 2 MINOR_REV = 1 -MICRO_REV = 16 +MICRO_REV = 17 REL_LEVEL = FINAL # at most 15 beta releases! REL_SERIAL = 0 |