Re: [Mailman-checkins] [Branch ~mailman-coders/mailman/2.1]

[Barry Warsaw]

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

On Nov 18, 2007, at 9:28 PM, Mark Sapiro wrote:

 Thanks Barry,

 I'm trying to do too many things at once. I didn't consider the effect
 on the translations. I have backed out the changes that were just
 gratuitous trailing whitespace removal in i18n'd messages and
 regenerated the mailman.pot.

You rock Mark!
- -Barry

-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.7 (Darwin)

iD8DBQFHQYpU2YZpQepbvXERAkLxAJ46JqBkXw0ZesiH1aOCN8r2PcebyQCgjUiY
vr/H8IFFSBcQWS01P6fd9nI=
=bJML
-END PGP SIGNATURE-
___
Mailman-checkins mailing list
Mailman-checkins@python.org
Unsubscribe: 
http://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org

Re: [Mailman-checkins] [Mailman-Developers] [Branch ~mailman-coders/mailman/2.1]

[Barry Warsaw]

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

On Nov 18, 2007, at 10:38 PM, Mark Sapiro wrote:

 === modified file 'Mailman/versions.py'
 --- a/Mailman/versions.py   2005-12-30 18:50:08 +
 +++ b/Mailman/versions.py   2007-10-05 01:35:10 +
 @@ -483,10 +483,11 @@
  # blow away the original timestamp and request id.
 This means the
  # request will live a little longer than it possibly
 should have,
  # but that's no big deal.
 +import email
  for p in v:
  author, text = p[2]
  reason = p[3]
 -msg = Message.OutgoingMessage(text)
 +msg = email.message_from_string(text,
 Message.Message)
  l.HoldMessage(msg, reason)
  del r[k]
  elif k == 'add_member':

 Should the import happen at the module global level?


 I thought about that. Our standards of course say yes, but this
 particular import only occurs when updating a Mailman 1.0.x list  
 which I
 hope happens very infrequently. However I don't really feel strongly
 either way.

Ultimately it's a style issue.  I'm nearly positive that it will make  
no significant different in performance.  Generally I like to have  
function scope imports only when necessary (e.g. to avoid circular  
import problems).  But I'll leave it up to you to change or not.

Cheers,
- -Barry

-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.7 (Darwin)

iD8DBQFHQY6X2YZpQepbvXERAlNpAJ91ZKrl0gWY5r+l0OoPhwasBY0YHACgo/38
1QGhKpAIyf8gPgY0mCJIm6o=
=z8gz
-END PGP SIGNATURE-
___
Mailman-checkins mailing list
Mailman-checkins@python.org
Unsubscribe: 
http://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org

Re: [Mailman-checkins] [Mailman-Developers] [Branch ~mailman-coders/mailman/2.1]

[Mark Sapiro]

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

Barry Warsaw wrote:
 On Nov 18, 2007, at 10:38 PM, Mark Sapiro wrote:
 
 I thought about that. Our standards of course say yes, but this
 particular import only occurs when updating a Mailman 1.0.x list which I
 hope happens very infrequently. However I don't really feel strongly
 either way.
 
 Ultimately it's a style issue.  I'm nearly positive that it will make no
 significant different in performance.  Generally I like to have function
 scope imports only when necessary (e.g. to avoid circular import
 problems).  But I'll leave it up to you to change or not.


I've moved the email import, and also an import of _BounceInfo. I'm
ready to commit this, but I want to run it by you first to see if I'm
missing anything with regard to moving the import of _BounceInfo.

=== modified file 'Mailman/versions.py'
- --- Mailman/versions.py 2007-10-05 02:50:56 +
+++ Mailman/versions.py 2007-11-19 17:02:10 +
@@ -33,11 +33,14 @@
 


+import email
+
 from types import ListType, StringType

 from Mailman import mm_cfg
 from Mailman import Utils
 from Mailman import Message
+from Mailman.Bouncer import _BounceInfo
 from Mailman.MemberAdaptor import UNKNOWN
 from Mailman.Logging.Syslog import syslog

@@ -419,7 +422,6 @@
 # Go through all the keys in bounce_info.  If the key is not a
member, or
 # if the data is not a _BounceInfo instance, chuck the bounce info.
 We're
 # doing things differently now.
- -from Mailman.Bouncer import _BounceInfo
 for m in mlist.bounce_info.keys():
 if not mlist.isMember(m) or not isinstance(mlist.getBounceInfo(m),
_BounceInfo):
@@ -483,7 +485,6 @@
 # blow away the original timestamp and request id.  This
means the
 # request will live a little longer than it possibly should
have,
 # but that's no big deal.
- -import email
 for p in v:
 author, text = p[2]
 reason = p[3]


- --
Mark Sapiro [EMAIL PROTECTED]   The highway is for gamblers,
San Francisco Bay Area, Californiabetter use your sense - B. Dylan

-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.7 (MingW32)

iD8DBQFHQcRxVVuXXpU7hpMRArZAAKD8R2Cif0NNC1X89rqyHn0hEjKibQCfRsSf
wx9HFj66t+cnR7BtyE16s64=
=C90I
-END PGP SIGNATURE-
___
Mailman-checkins mailing list
Mailman-checkins@python.org
Unsubscribe: 
http://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org

[Mailman-checkins] [Branch ~mailman-coders/mailman/2.1]

[noreply]

revno: 1016
committer: Mark Sapiro [EMAIL PROTECTED]
branch nick: 2.1
timestamp: Mon 2007-11-19 12:30:51 -0800
message:
  BounceRunner.py - Fixed a mail loop if a list owner puts the list's -bounces
or -admin address in the list's owner attribute (1834569).
modified:
  Mailman/Queue/BounceRunner.py

=== modified file 'Mailman/Queue/BounceRunner.py'
--- a/Mailman/Queue/BounceRunner.py 2006-03-09 22:09:34 +
+++ b/Mailman/Queue/BounceRunner.py 2007-11-19 20:30:51 +
@@ -180,11 +180,21 @@
 #   but a list owner address itself bounced.  That's bad, and for now
 #   we'll simply log the problem and attempt to deliver the message to
 #   the site owner.
-#
+# - the list owner could have set listname-bounces as the owner
+#   address.  That's really bad as it results in a loop of ever
+#   growing unrecognized bounce messages.  We detect this based on the
+#   X-BeenThere header and handle it like a list owner bounce.  No
+#   real bounce will have an X-BeenThere header for the list.
+bts = [s.strip().lower() for s in msg.get_all('x-beenthere', [])]
+if mlist.GetListEmail().lower() in bts:
+bt = True
+else:
+bt = False
 # All messages to [EMAIL PROTECTED] have their envelope sender set
 # to [EMAIL PROTECTED] (no virtual domain).  Is this a bounce for a
-# message to a list owner, coming to the site owner?
-if msg.get('to', '') == Utils.get_site_email(extra='owner'):
+# message to a list owner, coming to the site owner, or an owner
+# notice sent directly to the -bounces address?
+if msg.get('to', '') == Utils.get_site_email(extra='owner') or bt:
 # Send it on to the site owners, but craft the envelope sender to
 # be the -loop detection address, so if /they/ bounce, we won't
 # get stuck in a bounce loop.
@@ -192,6 +202,7 @@
  recips=[Utils.get_site_email()],
  envsender=Utils.get_site_email(extra='loop'),
  )
+return
 # List isn't doing bounce processing?
 if not mlist.bounce_processing:
 return



--

https://code.launchpad.net/~mailman-coders/mailman/2.1

You are receiving this branch notification because you are subscribed to it.
To unsubscribe from this branch go to 
https://code.launchpad.net/~mailman-coders/mailman/2.1/+subscription/mailman-checkins.
___
Mailman-checkins mailing list
Mailman-checkins@python.org
Unsubscribe: 
http://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org