summaryrefslogtreecommitdiff
path: root/src/mailman/rules/dmarc.py
diff options
context:
space:
mode:
authorMark Sapiro2017-01-01 12:55:46 -0800
committerMark Sapiro2017-01-01 12:55:46 -0800
commit6b06535a572f0457844ef262f133a3b04145ef3f (patch)
tree93349e2621bfebccb54fcb15cce111c629908904 /src/mailman/rules/dmarc.py
parentc786a77c3b82932facd63fabe3144f9099f1ea51 (diff)
downloadmailman-6b06535a572f0457844ef262f133a3b04145ef3f.tar.gz
mailman-6b06535a572f0457844ef262f133a3b04145ef3f.tar.zst
mailman-6b06535a572f0457844ef262f133a3b04145ef3f.zip
Diffstat (limited to 'src/mailman/rules/dmarc.py')
-rw-r--r--src/mailman/rules/dmarc.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mailman/rules/dmarc.py b/src/mailman/rules/dmarc.py
index 5a1073970..43bbfc609 100644
--- a/src/mailman/rules/dmarc.py
+++ b/src/mailman/rules/dmarc.py
@@ -28,9 +28,10 @@ from mailman.config import config
from mailman.core.i18n import _
from mailman.interfaces.mailinglist import DMARCMitigateAction
from mailman.interfaces.rules import IRule
+from mailman.utilities import protocols
from mailman.utilities.string import wrap
from public import public
-from urllib import error, request
+from urllib import error
from zope.interface import implementer
@@ -48,12 +49,11 @@ def _get_suffixes(url):
if not url:
return
try:
- d = request.urlopen(url)
+ d = protocols.get(url)
except error.URLError as e:
elog.error('Unable to retrieve data from %s: %s', url, e.reason)
return
- for line in d.readlines():
- line = str(line, encoding='utf-8')
+ for line in d.splitlines():
if not line.strip() or line.startswith('//'):
continue
line = re.sub('\s.*', '', line)