diff options
Diffstat (limited to 'Mailman')
| -rwxr-xr-x | Mailman/Defaults.py.in | 2 | ||||
| -rw-r--r-- | Mailman/MTA/Manual.py | 2 | ||||
| -rw-r--r-- | Mailman/MTA/Postfix.py | 5 | ||||
| -rw-r--r-- | Mailman/Utils.py | 9 | ||||
| -rw-r--r-- | Mailman/i18n.py | 6 |
5 files changed, 13 insertions, 11 deletions
diff --git a/Mailman/Defaults.py.in b/Mailman/Defaults.py.in index 4881bbba..06b3e0ad 100755 --- a/Mailman/Defaults.py.in +++ b/Mailman/Defaults.py.in @@ -136,7 +136,7 @@ SUBSCRIBE_FORM_MIN_TIME = seconds(5) # in the installation. This supplements the individual list's ban_list. # For example, to ban xxx@aol.com and any @gmail.com address beginning with # yyy, set -# GLOBAL_BAN_LIST = ['xxx@aol.com', '^yyy.*@gmail\.com'] +# GLOBAL_BAN_LIST = ['xxx@aol.com', '^yyy.*@gmail\.com$'] GLOBAL_BAN_LIST = [] # Command that is used to convert text/html parts into plain text. This diff --git a/Mailman/MTA/Manual.py b/Mailman/MTA/Manual.py index 0abde2e2..14158263 100644 --- a/Mailman/MTA/Manual.py +++ b/Mailman/MTA/Manual.py @@ -1,4 +1,4 @@ -# Copyright (C) 2001-2005 by the Free Software Foundation, Inc. +# Copyright (C) 2001-2016 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 diff --git a/Mailman/MTA/Postfix.py b/Mailman/MTA/Postfix.py index add5453e..8860459e 100644 --- a/Mailman/MTA/Postfix.py +++ b/Mailman/MTA/Postfix.py @@ -1,4 +1,4 @@ -# Copyright (C) 2001-2014 by the Free Software Foundation, Inc. +# Copyright (C) 2001-2016 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 @@ -394,7 +394,8 @@ def checkperms(state): owner = pwd.getpwuid(stat[ST_UID])[0] except KeyError: owner = 'uid %d' % stat[ST_UID] - print C_('%(dbfile)s owned by %(owner)s (must be owned by %(user)s'), + print C_( + '%(dbfile)s owned by %(owner)s (must be owned by %(user)s'), state.ERRORS += 1 if state.FIX: print C_('(fixing)') diff --git a/Mailman/Utils.py b/Mailman/Utils.py index 682f5058..f821f13a 100644 --- a/Mailman/Utils.py +++ b/Mailman/Utils.py @@ -1165,8 +1165,8 @@ def suspiciousHTML(html): s_dict = {} def get_suffixes(url): - """This loads the data from the url argument into s_dict for use by -get_org_dom.""" + """This loads and parses the data from the url argument into s_dict for + use by get_org_dom.""" global s_dict if s_dict: return @@ -1194,14 +1194,15 @@ get_org_dom.""" s_dict[k] = exc def _get_dom(d, l): - """A helper to get a domain name consisting of the first l labels in d.""" + """A helper to get a domain name consisting of the first l+1 labels + in d.""" dom = d[:min(l+1, len(d))] dom.reverse() return '.'.join(dom) def get_org_dom(domain): """Given a domain name, this returns the corresponding Organizational -Domain which may be the same as the input.""" + Domain which may be the same as the input.""" global s_dict if not s_dict: get_suffixes(mm_cfg.DMARC_ORGANIZATIONAL_DOMAIN_DATA_URL) diff --git a/Mailman/i18n.py b/Mailman/i18n.py index 0cfdb995..102bee83 100644 --- a/Mailman/i18n.py +++ b/Mailman/i18n.py @@ -1,4 +1,4 @@ -# Copyright (C) 2000-2010 by the Free Software Foundation, Inc. +# Copyright (C) 2000-2016 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 @@ -15,9 +15,9 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, # USA. -import locale import sys import time +import locale import gettext from types import StringType, UnicodeType @@ -64,7 +64,7 @@ if _translation is None: -def _(s, frame = 1): +def _(s, frame=1): if s == '': return s assert s |