aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Sapiro <mark@msapiro.net>2016-05-04 18:27:19 -0700
committerMark Sapiro <mark@msapiro.net>2016-05-04 18:27:19 -0700
commit6a615a1e6c6b3b03c3d8e334e6b097f29c9c975a (patch)
tree0d4a933c422e14d5094240a5d29a58abc5610e22
parent1adb205d2cf4e6c53ade88ff4dc9c3e42ee08d35 (diff)
downloadmailman2-6a615a1e6c6b3b03c3d8e334e6b097f29c9c975a.tar.gz
mailman2-6a615a1e6c6b3b03c3d8e334e6b097f29c9c975a.tar.xz
mailman2-6a615a1e6c6b3b03c3d8e334e6b097f29c9c975a.zip
Allow DMARC_ORGANIZATIONAL_DOMAIN_DATA_URL to be None or the null string.
Diffstat (limited to '')
-rw-r--r--Mailman/Utils.py2
-rw-r--r--NEWS3
2 files changed, 5 insertions, 0 deletions
diff --git a/Mailman/Utils.py b/Mailman/Utils.py
index 892bb5c8..2dbaef0b 100644
--- a/Mailman/Utils.py
+++ b/Mailman/Utils.py
@@ -1170,6 +1170,8 @@ def get_suffixes(url):
global s_dict
if s_dict:
return
+ if not url:
+ return
try:
d = urllib2.urlopen(url)
except urllib2.URLError, e:
diff --git a/NEWS b/NEWS
index 63cab408..e9939cde 100644
--- a/NEWS
+++ b/NEWS
@@ -19,6 +19,9 @@ Here is a history of user visible changes to Mailman.
(LP: #1572330)
Bug fixes and other patches
+
+ - A site can now set DMARC_ORGANIZATIONAL_DOMAIN_DATA_URL to None or the
+ null string if it wants to avoid using this. (LP: #1578450)
- The white space to the left of the admindb Logout link is no longer
part of the link. (LP: #1573623)