From ae7ca842a8768ccc4da17d82218f2bc1e698169f Mon Sep 17 00:00:00 2001
From: bwarsaw
Date: Thu, 9 May 2002 15:06:13 +0000
Subject: Backing out the last two patches.  This wasn't the right place to
 make this change.

---
 cron/disabled | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/cron/disabled b/cron/disabled
index 68002df76..31c1ca4f3 100644
--- a/cron/disabled
+++ b/cron/disabled
@@ -46,7 +46,6 @@ from Mailman import mm_cfg
 from Mailman import Utils
 from Mailman import MailList
 from Mailman import MemberAdaptor
-from Mailman.Bouncer import _BounceInfo
 from Mailman.Logging.Syslog import syslog
 from Mailman.i18n import _
 
@@ -104,19 +103,13 @@ def main():
             if mlist.getDeliveryStatus(member) <> MemberAdaptor.ENABLED:
                 continue
             info = mlist.getBounceInfo(member)
-            if not isinstance(info, _BounceInfo):
-                # It's old bounce data, which is useless to us.  Reset.
-                disables.append((member, None))
-            elif info.score >= mlist.bounce_score_threshold:
+            if info.score >= mlist.bounce_score_threshold:
                 disables.append((member, info))
         if disables:
             mlist.Lock()
             try:
                 for member, info in disables:
-                    if info is None:
-                        mlist.setBounceInfo(member, None)
-                    else:
-                        mlist.disableBouncingMember(member, info, msg)
+                    mlist.disableBouncingMember(member, info, msg)
                 mlist.Save()
             finally:
                 mlist.Unlock()
-- 
cgit v1.2.3-70-g09d2