summaryrefslogtreecommitdiff
path: root/mailman/commands
diff options
context:
space:
mode:
authorBarry Warsaw2009-01-01 17:58:39 -0500
committerBarry Warsaw2009-01-01 17:58:39 -0500
commit1c285f110d8e98597453c6b4b69ea01163033547 (patch)
tree00c7ec16711b2073e40f593658f652726a9d4231 /mailman/commands
parent12513c7d0fc1f5d2a1aabda349637309f6e8300b (diff)
parent600ddb503a391d70230d96ee91a631888d11b35a (diff)
downloadmailman-1c285f110d8e98597453c6b4b69ea01163033547.tar.gz
mailman-1c285f110d8e98597453c6b4b69ea01163033547.tar.zst
mailman-1c285f110d8e98597453c6b4b69ea01163033547.zip
Two major structural conversions.
* Use zc.buildout and zc.testing frameworks for building and testing Mailman. * Use lazr.config as the configuration system, though this conversion is not yet complete. Also: move a bunch of old bin scripts to the attic.
Diffstat (limited to 'mailman/commands')
-rw-r--r--mailman/commands/__init__.py2
-rw-r--r--mailman/commands/cmd_confirm.py4
-rw-r--r--mailman/commands/cmd_help.py4
-rw-r--r--mailman/commands/cmd_info.py2
-rw-r--r--mailman/commands/cmd_leave.py2
-rw-r--r--mailman/commands/cmd_lists.py4
-rw-r--r--mailman/commands/cmd_password.py4
-rw-r--r--mailman/commands/cmd_remove.py2
-rw-r--r--mailman/commands/cmd_set.py4
-rw-r--r--mailman/commands/cmd_stop.py2
-rw-r--r--mailman/commands/cmd_unsubscribe.py2
-rw-r--r--mailman/commands/cmd_who.py4
-rw-r--r--mailman/commands/docs/echo.txt1
-rw-r--r--mailman/commands/docs/end.txt1
-rw-r--r--mailman/commands/docs/join.txt4
-rw-r--r--mailman/commands/echo.py2
-rw-r--r--mailman/commands/end.py2
-rw-r--r--mailman/commands/join.py4
18 files changed, 23 insertions, 27 deletions
diff --git a/mailman/commands/__init__.py b/mailman/commands/__init__.py
index 52374888a..6e89bc6da 100644
--- a/mailman/commands/__init__.py
+++ b/mailman/commands/__init__.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2008 by the Free Software Foundation, Inc.
+# Copyright (C) 2008-2009 by the Free Software Foundation, Inc.
#
# This file is part of GNU Mailman.
#
diff --git a/mailman/commands/cmd_confirm.py b/mailman/commands/cmd_confirm.py
index 20fa0169e..b5e4182bd 100644
--- a/mailman/commands/cmd_confirm.py
+++ b/mailman/commands/cmd_confirm.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2008 by the Free Software Foundation, Inc.
+# Copyright (C) 2002-2009 by the Free Software Foundation, Inc.
#
# This file is part of GNU Mailman.
#
@@ -23,7 +23,7 @@
from mailman import Errors
from mailman import Pending
-from mailman.configuration import config
+from mailman.config import config
from mailman.i18n import _
STOP = 1
diff --git a/mailman/commands/cmd_help.py b/mailman/commands/cmd_help.py
index 4577c947e..eeee33ca7 100644
--- a/mailman/commands/cmd_help.py
+++ b/mailman/commands/cmd_help.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2008 by the Free Software Foundation, Inc.
+# Copyright (C) 2002-2009 by the Free Software Foundation, Inc.
#
# This file is part of GNU Mailman.
#
@@ -24,7 +24,7 @@ import os
import sys
from mailman import Utils
-from mailman.configuration import config
+from mailman.config import config
from mailman.i18n import _
EMPTYSTRING = ''
diff --git a/mailman/commands/cmd_info.py b/mailman/commands/cmd_info.py
index c14ade110..3bdea178f 100644
--- a/mailman/commands/cmd_info.py
+++ b/mailman/commands/cmd_info.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2008 by the Free Software Foundation, Inc.
+# Copyright (C) 2002-2009 by the Free Software Foundation, Inc.
#
# This file is part of GNU Mailman.
#
diff --git a/mailman/commands/cmd_leave.py b/mailman/commands/cmd_leave.py
index 7b808925a..5844824f7 100644
--- a/mailman/commands/cmd_leave.py
+++ b/mailman/commands/cmd_leave.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2008 by the Free Software Foundation, Inc.
+# Copyright (C) 2002-2009 by the Free Software Foundation, Inc.
#
# This file is part of GNU Mailman.
#
diff --git a/mailman/commands/cmd_lists.py b/mailman/commands/cmd_lists.py
index b7b5a3b74..234ef46fc 100644
--- a/mailman/commands/cmd_lists.py
+++ b/mailman/commands/cmd_lists.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2008 by the Free Software Foundation, Inc.
+# Copyright (C) 2002-2009 by the Free Software Foundation, Inc.
#
# This file is part of GNU Mailman.
#
@@ -21,7 +21,7 @@
"""
from mailman.MailList import MailList
-from mailman.configuration import config
+from mailman.config import config
from mailman.i18n import _
diff --git a/mailman/commands/cmd_password.py b/mailman/commands/cmd_password.py
index 0c09aa99d..545da0cb5 100644
--- a/mailman/commands/cmd_password.py
+++ b/mailman/commands/cmd_password.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2008 by the Free Software Foundation, Inc.
+# Copyright (C) 2002-2009 by the Free Software Foundation, Inc.
#
# This file is part of GNU Mailman.
#
@@ -29,7 +29,7 @@
from email.Utils import parseaddr
-from mailman.configuration import config
+from mailman.config import config
from mailman.i18n import _
STOP = 1
diff --git a/mailman/commands/cmd_remove.py b/mailman/commands/cmd_remove.py
index 6c37ba32d..8f3ce9669 100644
--- a/mailman/commands/cmd_remove.py
+++ b/mailman/commands/cmd_remove.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2008 by the Free Software Foundation, Inc.
+# Copyright (C) 2002-2009 by the Free Software Foundation, Inc.
#
# This file is part of GNU Mailman.
#
diff --git a/mailman/commands/cmd_set.py b/mailman/commands/cmd_set.py
index 94ba9192f..020bc3636 100644
--- a/mailman/commands/cmd_set.py
+++ b/mailman/commands/cmd_set.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2008 by the Free Software Foundation, Inc.
+# Copyright (C) 2002-2009 by the Free Software Foundation, Inc.
#
# This file is part of GNU Mailman.
#
@@ -20,7 +20,7 @@ from email.Utils import parseaddr, formatdate
from mailman import Errors
from mailman import MemberAdaptor
from mailman import i18n
-from mailman.configuration import config
+from mailman.config import config
def _(s): return s
diff --git a/mailman/commands/cmd_stop.py b/mailman/commands/cmd_stop.py
index 0e4ba2b0e..fc3df69fd 100644
--- a/mailman/commands/cmd_stop.py
+++ b/mailman/commands/cmd_stop.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2008 by the Free Software Foundation, Inc.
+# Copyright (C) 2002-2009 by the Free Software Foundation, Inc.
#
# This file is part of GNU Mailman.
#
diff --git a/mailman/commands/cmd_unsubscribe.py b/mailman/commands/cmd_unsubscribe.py
index 68f09607c..456b8089d 100644
--- a/mailman/commands/cmd_unsubscribe.py
+++ b/mailman/commands/cmd_unsubscribe.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2008 by the Free Software Foundation, Inc.
+# Copyright (C) 2002-2009 by the Free Software Foundation, Inc.
#
# This file is part of GNU Mailman.
#
diff --git a/mailman/commands/cmd_who.py b/mailman/commands/cmd_who.py
index 725040f4d..6c66610b3 100644
--- a/mailman/commands/cmd_who.py
+++ b/mailman/commands/cmd_who.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2008 by the Free Software Foundation, Inc.
+# Copyright (C) 2002-2009 by the Free Software Foundation, Inc.
#
# This file is part of GNU Mailman.
#
@@ -18,7 +18,7 @@
from email.Utils import parseaddr
from mailman import i18n
-from mailman.configuration import config
+from mailman.config import config
STOP = 1
diff --git a/mailman/commands/docs/echo.txt b/mailman/commands/docs/echo.txt
index d2781d330..181cc58c8 100644
--- a/mailman/commands/docs/echo.txt
+++ b/mailman/commands/docs/echo.txt
@@ -4,7 +4,6 @@ The 'echo' command
The mail command 'echo' simply replies with the original command and arguments
to the sender.
- >>> from mailman.configuration import config
>>> command = config.commands['echo']
>>> command.name
'echo'
diff --git a/mailman/commands/docs/end.txt b/mailman/commands/docs/end.txt
index bd632de48..4f6af26cb 100644
--- a/mailman/commands/docs/end.txt
+++ b/mailman/commands/docs/end.txt
@@ -4,7 +4,6 @@ The 'end' command
The mail command processor recognized an 'end' command which tells it to stop
processing email messages.
- >>> from mailman.configuration import config
>>> command = config.commands['end']
>>> command.name
'end'
diff --git a/mailman/commands/docs/join.txt b/mailman/commands/docs/join.txt
index 492297787..fd382d0f0 100644
--- a/mailman/commands/docs/join.txt
+++ b/mailman/commands/docs/join.txt
@@ -4,7 +4,6 @@ The 'join' command
The mail command 'join' subscribes an email address to the mailing list.
'subscribe' is an alias for 'join'.
- >>> from mailman.configuration import config
>>> command = config.commands['join']
>>> print command.name
join
@@ -84,8 +83,7 @@ first.
Mailman has sent her the confirmation message.
- >>> from mailman.queue import Switchboard
- >>> virginq = Switchboard(config.VIRGINQUEUE_DIR)
+ >>> virginq = config.switchboards['virgin']
>>> qmsg, qdata = virginq.dequeue(virginq.files[0])
>>> print qmsg.as_string()
MIME-Version: 1.0
diff --git a/mailman/commands/echo.py b/mailman/commands/echo.py
index 9a7b2eba8..d2719e19b 100644
--- a/mailman/commands/echo.py
+++ b/mailman/commands/echo.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2008 by the Free Software Foundation, Inc.
+# Copyright (C) 2002-2009 by the Free Software Foundation, Inc.
#
# This file is part of GNU Mailman.
#
diff --git a/mailman/commands/end.py b/mailman/commands/end.py
index 831b0c045..e744ec7ba 100644
--- a/mailman/commands/end.py
+++ b/mailman/commands/end.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2008 by the Free Software Foundation, Inc.
+# Copyright (C) 2002-2009 by the Free Software Foundation, Inc.
#
# This file is part of GNU Mailman.
#
diff --git a/mailman/commands/join.py b/mailman/commands/join.py
index 17fb071a6..58fbb6428 100644
--- a/mailman/commands/join.py
+++ b/mailman/commands/join.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2008 by the Free Software Foundation, Inc.
+# Copyright (C) 2002-2009 by the Free Software Foundation, Inc.
#
# This file is part of GNU Mailman.
#
@@ -29,7 +29,7 @@ from email.utils import formataddr, parseaddr
from zope.interface import implements
from mailman.Utils import MakeRandomPassword
-from mailman.configuration import config
+from mailman.config import config
from mailman.i18n import _
from mailman.interfaces import (
ContinueProcessing, DeliveryMode, IEmailCommand)