From 4a8a833f14d93a9916e5b2181fdfff24ffd57477 Mon Sep 17 00:00:00 2001
From: Barry Warsaw
Date: Thu, 17 Mar 2011 16:33:35 -0400
Subject: Reimplement wrap() using modern techniques, and finally get rid of
 Utils.py!

---
 src/mailman/queue/archive.py | 2 +-
 src/mailman/queue/bounce.py  | 2 +-
 src/mailman/queue/digest.py  | 3 +--
 src/mailman/queue/maildir.py | 4 ++--
 4 files changed, 5 insertions(+), 6 deletions(-)

(limited to 'src/mailman/queue')

diff --git a/src/mailman/queue/archive.py b/src/mailman/queue/archive.py
index 24dab34f5..99682f310 100644
--- a/src/mailman/queue/archive.py
+++ b/src/mailman/queue/archive.py
@@ -27,7 +27,7 @@ import os
 import logging
 
 from datetime import datetime
-from email.Utils import parsedate_tz, mktime_tz, formatdate
+from email.utils import parsedate_tz, mktime_tz, formatdate
 from flufl.lock import Lock
 from lazr.config import as_timedelta
 
diff --git a/src/mailman/queue/bounce.py b/src/mailman/queue/bounce.py
index a53b2d072..968659352 100644
--- a/src/mailman/queue/bounce.py
+++ b/src/mailman/queue/bounce.py
@@ -23,7 +23,7 @@ import cPickle
 import logging
 import datetime
 
-from email.Utils import parseaddr
+from email.utils import parseaddr
 from lazr.config import as_timedelta
 
 from mailman.config import config
diff --git a/src/mailman/queue/digest.py b/src/mailman/queue/digest.py
index 2541e14ed..075335158 100644
--- a/src/mailman/queue/digest.py
+++ b/src/mailman/queue/digest.py
@@ -38,7 +38,6 @@ from email.mime.multipart import MIMEMultipart
 from email.mime.text import MIMEText
 from email.utils import formatdate, getaddresses, make_msgid
 
-from mailman.Utils import wrap
 from mailman.config import config
 from mailman.core.errors import DiscardMessage
 from mailman.core.i18n import _
@@ -48,7 +47,7 @@ from mailman.pipeline.scrubber import process as scrubber
 from mailman.queue import Runner
 from mailman.utilities.i18n import make
 from mailman.utilities.mailbox import Mailbox
-from mailman.utilities.string import oneline
+from mailman.utilities.string import oneline, wrap
 
 
 
diff --git a/src/mailman/queue/maildir.py b/src/mailman/queue/maildir.py
index 3d0b9497c..fe4dc9da1 100644
--- a/src/mailman/queue/maildir.py
+++ b/src/mailman/queue/maildir.py
@@ -53,8 +53,8 @@ import os
 import errno
 import logging
 
-from email.Parser import Parser
-from email.Utils import parseaddr
+from email.parser import Parser
+from email.utils import parseaddr
 
 from mailman.config import config
 from mailman.message import Message
-- 
cgit v1.3.1