------------------------------------------------------------
revno: 1680
fixes bug: https://launchpad.net/bugs/1637745
committer: Mark Sapiro <m...@msapiro.net>
branch nick: 2.1
timestamp: Sat 2016-10-29 10:05:15 -0700
message:
  Fixed a typo and deleted an unreferenced assignment.
modified:
  Mailman/Utils.py
  NEWS


--
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/Utils.py'
--- Mailman/Utils.py	2016-07-15 02:10:24 +0000
+++ Mailman/Utils.py	2016-10-29 17:05:15 +0000
@@ -1273,10 +1273,7 @@
               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 @@
                 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:

=== modified file 'NEWS'
--- NEWS	2016-10-27 22:37:37 +0000
+++ NEWS	2016-10-29 17:05:15 +0000
@@ -23,6 +23,9 @@
 
   Bug fixes and other patches
 
+    - Fixed a typo in Utils.py that could have resulted in a NameError in
+      logging an unlikely occurrence.  (LP: #1637745)
+
     - Fixed a bug which created incorrect "view more members" links at the
       bottom of the admin Membership List pages.  (LP: #1637061)
 

_______________________________________________
Mailman-checkins mailing list
Mailman-checkins@python.org
Unsubscribe: 
https://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org

Reply via email to