diff options
Diffstat (limited to '')
| -rw-r--r-- | Mailman/Cgi/admin.py | 9 | ||||
| -rw-r--r-- | Mailman/Utils.py | 7 |
2 files changed, 7 insertions, 9 deletions
diff --git a/Mailman/Cgi/admin.py b/Mailman/Cgi/admin.py index 843f6e08..736cc684 100644 --- a/Mailman/Cgi/admin.py +++ b/Mailman/Cgi/admin.py @@ -1188,11 +1188,12 @@ def membership_options(mlist, subcat, cgidata, doc, form): continue start = chunkmembers[i*chunksz] end = chunkmembers[min((i+1)*chunksz, last)-1] - url = url + 'chunk=%d' % i + findfrag - if isinstance(url, unicode): - url = url.encode(Utils.GetCharSet(mlist.preferred_language), + thisurl = url + 'chunk=%d' % i + findfrag + if isinstance(thisurl, unicode): + thisurl = thisurl.encode( + Utils.GetCharSet(mlist.preferred_language), errors='ignore') - link = Link(url, _('from %(start)s to %(end)s')) + link = Link(thisurl, _('from %(start)s to %(end)s')) buttons.append(link) buttons = UnorderedList(*buttons) container.AddItem(footer + buttons.Format() + '<p>') diff --git a/Mailman/Utils.py b/Mailman/Utils.py index d2317b10..7bae2e6e 100644 --- a/Mailman/Utils.py +++ b/Mailman/Utils.py @@ -1273,10 +1273,7 @@ def _DMARCProhibited(mlist, email, dmarc_domain, org=False): email, dmarc_domain, e.__doc__) return 'continue' else: -# people are already being dumb, don't trust them to provide honest DNS -# where the answer section only contains what was asked for, nor to include -# CNAMEs before the values they point to. - full_record = "" + # Be as robust as possible in parsing the result. results_by_name = {} cnames = {} want_names = set([dmarc_domain + '.']) @@ -1316,7 +1313,7 @@ def _DMARCProhibited(mlist, email, dmarc_domain, org=False): syslog('error', """RRset of TXT records for %s has %d v=DMARC1 entries; testing them all""", - dmarc_domain, len(dmarc)) + dmarc_domain, len(dmarcs)) for entry in dmarcs: mo = re.search(r'\bsp=(\w*)\b', entry, re.IGNORECASE) if org and mo: |