summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbwarsaw2006-09-24 20:43:56 +0000
committerbwarsaw2006-09-24 20:43:56 +0000
commit99a4f0ef16e6dfddafbd396896afb97821528f16 (patch)
tree0cabc1a41a6532de1ad63a1b43bd2e941150d0ec
parent3da41d89a8c827383b2256b965fa1be8b179b9cd (diff)
downloadmailman-99a4f0ef16e6dfddafbd396896afb97821528f16.tar.gz
mailman-99a4f0ef16e6dfddafbd396896afb97821528f16.tar.zst
mailman-99a4f0ef16e6dfddafbd396896afb97821528f16.zip
-rw-r--r--Mailman/Cgi/admin.py2
-rw-r--r--Mailman/Cgi/listinfo.py2
-rw-r--r--Mailman/Errors.py9
-rw-r--r--Mailman/MailList.py2
-rw-r--r--scripts/driver2
5 files changed, 13 insertions, 4 deletions
diff --git a/Mailman/Cgi/admin.py b/Mailman/Cgi/admin.py
index 3ba876340..ed033d49a 100644
--- a/Mailman/Cgi/admin.py
+++ b/Mailman/Cgi/admin.py
@@ -218,7 +218,7 @@ def admin_overview(msg=''):
bgcolor=mm_cfg.WEB_HEADER_COLOR)
# Skip any mailing list that isn't advertised.
advertised = []
- listnames = Utils.list_names()
+ listnames = list(Utils.list_names())
listnames.sort()
for name in listnames:
diff --git a/Mailman/Cgi/listinfo.py b/Mailman/Cgi/listinfo.py
index d8281ccea..37c7f8ea9 100644
--- a/Mailman/Cgi/listinfo.py
+++ b/Mailman/Cgi/listinfo.py
@@ -82,7 +82,7 @@ def listinfo_overview(msg=''):
# Skip any mailing lists that isn't advertised.
advertised = []
- listnames = Utils.list_names()
+ listnames = list(Utils.list_names())
listnames.sort()
for name in listnames:
diff --git a/Mailman/Errors.py b/Mailman/Errors.py
index a0fdd8c52..26333a688 100644
--- a/Mailman/Errors.py
+++ b/Mailman/Errors.py
@@ -28,7 +28,14 @@ class MailmanException(Exception):
# Exceptions for problems related to opening a list
class MMListError(MailmanException): pass
-class MMUnknownListError(MMListError): pass
+
+class MMUnknownListError(MMListError):
+ def __init__(self, listname=None):
+ self._listname = listname
+
+ def __str__(self):
+ return self._listname
+
class MMCorruptListDatabaseError(MMListError): pass
class MMListNotReadyError(MMListError): pass
class MMListAlreadyExistsError(MMListError): pass
diff --git a/Mailman/MailList.py b/Mailman/MailList.py
index dcf70a94a..89ace8565 100644
--- a/Mailman/MailList.py
+++ b/Mailman/MailList.py
@@ -647,7 +647,7 @@ class MailList(HTMLFormatter, Deliverer, ListAdmin,
if fqdn_listname is None:
fqdn_listname = self.fqdn_listname
if not Utils.list_exists(fqdn_listname):
- raise Errors.MMUnknownListError
+ raise Errors.MMUnknownListError(fqdn_listname)
self._memberadaptor.load()
# We first try to load config.pck, which contains the up-to-date
# version of the database. If that fails, perhaps because it's
diff --git a/scripts/driver b/scripts/driver
index 20cbece10..4cf182dd4 100644
--- a/scripts/driver
+++ b/scripts/driver
@@ -68,6 +68,8 @@ def run_main():
log = None
try:
import paths
+ from Mailman.configuration import config
+ config.load()
# When running in non-stealth mode, we need to escape entities,
# otherwise we're vulnerable to cross-site scripting attacks.
try: