------------------------------------------------------------
revno: 1624
committer: Mark Sapiro <m...@msapiro.net>
branch nick: 2.1
timestamp: Fri 2016-02-26 14:02:44 -0800
message:
Minor documentation clean up.
modified:
Mailman/Defaults.py.in
Mailman/Utils.py
--
lp:mailman/2.1
https://code.launchpad.net/~mailman-coders/mailman/2.1
Your team Mailman Checkins is subscribed to branch lp:mailman/2.1.
To unsubscribe from this branch go to
https://code.launchpad.net/~mailman-coders/mailman/2.1/+edit-subscription
=== modified file 'Mailman/Defaults.py.in'
--- Mailman/Defaults.py.in 2016-02-26 04:45:44 +0000
+++ Mailman/Defaults.py.in 2016-02-26 22:02:44 +0000
@@ -136,7 +136,7 @@
# in the installation. This supplements the individual list's ban_list.
# For example, to ban x...@aol.com and any @gmail.com address beginning with
# yyy, set
-# GLOBAL_BAN_LIST = ['x...@aol.com', '^yyy.*@gmail\.com']
+# GLOBAL_BAN_LIST = ['x...@aol.com', '^yyy.*@gmail\.com$']
GLOBAL_BAN_LIST = []
# Command that is used to convert text/html parts into plain text. This
=== modified file 'Mailman/Utils.py'
--- Mailman/Utils.py 2016-02-26 06:09:08 +0000
+++ Mailman/Utils.py 2016-02-26 22:02:44 +0000
@@ -1165,8 +1165,8 @@
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 @@
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)
_______________________________________________
Mailman-checkins mailing list
Mailman-checkins@python.org
Unsubscribe:
https://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org
