diff options
Diffstat (limited to 'Mailman/Cgi')
| -rw-r--r-- | Mailman/Cgi/admin.py | 3 | ||||
| -rw-r--r-- | Mailman/Cgi/admindb.py | 11 | ||||
| -rw-r--r-- | Mailman/Cgi/confirm.py | 5 | ||||
| -rw-r--r-- | Mailman/Cgi/create.py | 3 | ||||
| -rw-r--r-- | Mailman/Cgi/edithtml.py | 3 | ||||
| -rw-r--r-- | Mailman/Cgi/private.py | 22 |
6 files changed, 25 insertions, 22 deletions
diff --git a/Mailman/Cgi/admin.py b/Mailman/Cgi/admin.py index b75ff2df..8434c817 100644 --- a/Mailman/Cgi/admin.py +++ b/Mailman/Cgi/admin.py @@ -12,7 +12,8 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, +# USA. """Process and produce the list-administration options forms.""" diff --git a/Mailman/Cgi/admindb.py b/Mailman/Cgi/admindb.py index 3f421cfe..7f42c8ac 100644 --- a/Mailman/Cgi/admindb.py +++ b/Mailman/Cgi/admindb.py @@ -12,7 +12,8 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, +# USA. """Produce and process the pending-approval items for a list.""" @@ -688,9 +689,9 @@ def process_form(mlist, doc, cgidata): senderactions.setdefault(sender, {})[action] = value # discard-all-defers try: - discardalldefersp = cgidata.getvalue('discardalldefersp', 0) + discardalldefersp = cgidata.getvalue('discardalldefersp', 0) except ValueError: - discardalldefersp = 0 + discardalldefersp = 0 for sender in senderactions.keys(): actions = senderactions[sender] # Handle what to do about all this sender's held messages @@ -698,8 +699,8 @@ def process_form(mlist, doc, cgidata): action = int(actions.get('senderaction', mm_cfg.DEFER)) except ValueError: action = mm_cfg.DEFER - if action == mm_cfg.DEFER and discardalldefersp: - action = mm_cfg.DISCARD + if action == mm_cfg.DEFER and discardalldefersp: + action = mm_cfg.DISCARD if action in (mm_cfg.DEFER, mm_cfg.APPROVE, mm_cfg.REJECT, mm_cfg.DISCARD): preserve = actions.get('senderpreserve', 0) diff --git a/Mailman/Cgi/confirm.py b/Mailman/Cgi/confirm.py index 6238e72a..6f31b6eb 100644 --- a/Mailman/Cgi/confirm.py +++ b/Mailman/Cgi/confirm.py @@ -12,7 +12,8 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, +# USA. """Confirm a pending action via URL.""" @@ -792,7 +793,7 @@ def reenable_prompt(mlist, doc, cookie, list, member): <a href="%(listinfourl)s">list information page</a>.""")]) return - date = time.strftime('%A, %B %d, %Y', + date = time.strftime('%A, %B %d, %Y', time.localtime(time.mktime(info.date + (0,)*6))) daysleft = int(info.noticesleft * mlist.bounce_you_are_disabled_warnings_interval / diff --git a/Mailman/Cgi/create.py b/Mailman/Cgi/create.py index 661035c0..603a78e7 100644 --- a/Mailman/Cgi/create.py +++ b/Mailman/Cgi/create.py @@ -12,7 +12,8 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, +# USA. """Create mailing lists through the web.""" diff --git a/Mailman/Cgi/edithtml.py b/Mailman/Cgi/edithtml.py index 1d36d5f6..2159985d 100644 --- a/Mailman/Cgi/edithtml.py +++ b/Mailman/Cgi/edithtml.py @@ -12,7 +12,8 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, +# USA. """Script which implements admin editing of the list's html templates.""" diff --git a/Mailman/Cgi/private.py b/Mailman/Cgi/private.py index 7dcd39ca..35b38dea 100644 --- a/Mailman/Cgi/private.py +++ b/Mailman/Cgi/private.py @@ -15,8 +15,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, # USA. -"""Provide a password-interface wrapper around private archives. -""" +"""Provide a password-interface wrapper around private archives.""" import os import sys @@ -136,19 +135,18 @@ def main(): charset = Utils.GetCharSet(mlist.preferred_language) print 'Content-type: text/html; charset=' + charset + '\n\n' # Put the original full path in the authorization form, but avoid - # trailing slash if we're not adding parts. We add it below. + # trailing slash if we're not adding parts. We add it below. action = mlist.GetScriptURL('private', absolute=1) if parts[1:]: action = os.path.join(action, SLASH.join(parts[1:])) - # If we added '/index.html' to true_filename, add a slash to the - # URL. We need this because we no longer add the trailing slash in - # the private.html template. It's always OK to test parts[-1] - # since we've already verified parts[0] is listname. - # The basic rule is if the post URL (action) is a directory, it must - # be slash terminated, and not if it's a file. Otherwise, relative - # links in the target archive page don't work. - if true_filename.endswith('/index.html') and \ - parts[-1] <> 'index.html': + # If we added '/index.html' to true_filename, add a slash to the URL. + # We need this because we no longer add the trailing slash in the + # private.html template. It's always OK to test parts[-1] since we've + # already verified parts[0] is listname. The basic rule is if the + # post URL (action) is a directory, it must be slash terminated, but + # not if it's a file. Otherwise, relative links in the target archive + # page don't work. + if true_filename.endswith('/index.html') and parts[-1] <> 'index.html': action += SLASH print Utils.maketext( 'private.html', |