summaryrefslogtreecommitdiff
path: root/src/mailman/bin/config_list.py
diff options
context:
space:
mode:
authorBarry Warsaw2011-03-17 16:33:35 -0400
committerBarry Warsaw2011-03-17 16:33:35 -0400
commit4a8a833f14d93a9916e5b2181fdfff24ffd57477 (patch)
tree6cdb98233fecee5e351bc2e593ab6cc7e145205c /src/mailman/bin/config_list.py
parent7c1ac388926288a3b098705e3aadee333128ae51 (diff)
downloadmailman-4a8a833f14d93a9916e5b2181fdfff24ffd57477.tar.gz
mailman-4a8a833f14d93a9916e5b2181fdfff24ffd57477.tar.zst
mailman-4a8a833f14d93a9916e5b2181fdfff24ffd57477.zip
Diffstat (limited to 'src/mailman/bin/config_list.py')
-rw-r--r--src/mailman/bin/config_list.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/mailman/bin/config_list.py b/src/mailman/bin/config_list.py
index 845a1371d..a40f4ee52 100644
--- a/src/mailman/bin/config_list.py
+++ b/src/mailman/bin/config_list.py
@@ -22,10 +22,10 @@ import optparse
from mailman import MailList
from mailman import errors
-from mailman.Utils import wrap
from mailman.configuration import config
from mailman.core.i18n import _
from mailman.initialize import initialize
+from mailman.utilities.string import wrap
from mailman.version import MAILMAN_VERSION
@@ -140,7 +140,7 @@ def do_list_categories(mlist, k, subcat, outfp):
# triple-quoted string nonsense in the source code.
desc = NL.join([s.lstrip() for s in info[0].splitlines()])
# Print out the category description
- desc = Utils.wrap(desc)
+ desc = wrap(desc)
for line in desc.splitlines():
print >> outfp, '#', line
print >> outfp
@@ -162,7 +162,7 @@ def do_list_categories(mlist, k, subcat, outfp):
desc = re.sub('&lt;', '<', desc)
desc = re.sub('&gt;', '>', desc)
# Print out the variable description.
- desc = Utils.wrap(desc)
+ desc = wrap(desc)
for line in desc.split('\n'):
print >> outfp, '#', line
# munge the value based on its type
@@ -246,8 +246,8 @@ def do_input(listname, infile, checkonly, verbose, parser):
# Open the specified list locked, unless checkonly is set
try:
mlist = MailList.MailList(listname, lock=not checkonly)
- except errors.MMListError, e:
- parser.error(_('No such list "$listname"\n$e'))
+ except errors.MMListError as error:
+ parser.error(_('No such list "$listname"\n$error'))
savelist = False
guibyprop = getPropertyMap(mlist)
try: