summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbwarsaw2006-04-17 13:24:13 +0000
committerbwarsaw2006-04-17 13:24:13 +0000
commitc225f5f37a089b645ba6aff4ad0e41fcce12c723 (patch)
tree8b0573f8168f10f23f15fa12c3849c9ac5fc1f42
parent953d9bff95f70b66b1b6c04340959185a11c3d10 (diff)
downloadmailman-c225f5f37a089b645ba6aff4ad0e41fcce12c723.tar.gz
mailman-c225f5f37a089b645ba6aff4ad0e41fcce12c723.tar.zst
mailman-c225f5f37a089b645ba6aff4ad0e41fcce12c723.zip
-rw-r--r--Mailman/MailList.py2
-rw-r--r--Mailman/Makefile.in4
2 files changed, 3 insertions, 3 deletions
diff --git a/Mailman/MailList.py b/Mailman/MailList.py
index 6ea41f801..dd86b50bb 100644
--- a/Mailman/MailList.py
+++ b/Mailman/MailList.py
@@ -598,7 +598,7 @@ class MailList(HTMLFormatter, Deliverer, ListAdmin,
try:
try:
d = loadfunc(fp)
- if isinstance(d, dict):
+ if not isinstance(d, dict):
return None, 'Load() expected to return a dictionary'
except (EOFError, ValueError, TypeError, MemoryError,
cPickle.PicklingError, cPickle.UnpicklingError), e:
diff --git a/Mailman/Makefile.in b/Mailman/Makefile.in
index 93c7efdfe..96a617839 100644
--- a/Mailman/Makefile.in
+++ b/Mailman/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 1998-2003 by the Free Software Foundation, Inc.
+# Copyright (C) 1998-2006 by the Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -43,7 +43,7 @@ PACKAGEDIR= $(prefix)/Mailman
SHELL= /bin/sh
MODULES= $(srcdir)/*.py
-SUBDIRS= Cgi Logging Archiver Handlers Bouncers Queue MTA Gui Commands
+SUBDIRS= Cgi Archiver Handlers Bouncers Queue MTA Gui Commands
# Modes for directories and executables created by the install
# process. Default to group-writable directories but