5 files changed, 5 insertions, 5 deletions

diff --git a/src/mailman/commands/cmd_help.py b/src/mailman/commands/cmd_help.py
index eeee33ca7..30c8dc4d6 100644
--- a/src/mailman/commands/cmd_help.py
+++ b/src/mailman/commands/cmd_help.py
@@ -42,7 +42,7 @@ def process(res, args):
     # Since this message is personalized, add some useful information if the
     # address requesting help is a member of the list.
     msg = res.msg
-    for sender in  msg.get_senders():
+    for sender in  msg.senders:
         if mlist.isMember(sender):
             memberurl = mlist.GetOptionsURL(sender, absolute=1)
             urlhelp = _(
diff --git a/src/mailman/commands/docs/echo.txt b/src/mailman/commands/docs/echo.txt
index 181cc58c8..95b50b523 100644
--- a/src/mailman/commands/docs/echo.txt
+++ b/src/mailman/commands/docs/echo.txt
@@ -20,7 +20,7 @@ The original message is ignored, but the results receive the echoed command.
     >>> from mailman.queue.command import Results
     >>> results = Results()
 
-    >>> from mailman.Message import Message
+    >>> from mailman.email.message import Message
     >>> print command.process(mlist, Message(), {}, ('foo', 'bar'), results)
     ContinueProcessing.yes
     >>> print unicode(results)
diff --git a/src/mailman/commands/docs/end.txt b/src/mailman/commands/docs/end.txt
index 4f6af26cb..98ca25bda 100644
--- a/src/mailman/commands/docs/end.txt
+++ b/src/mailman/commands/docs/end.txt
@@ -20,7 +20,7 @@ message isn't even looked at.
 
     >>> from mailman.app.lifecycle import create_list
     >>> mlist = create_list(u'test@example.com')
-    >>> from mailman.Message import Message
+    >>> from mailman.email.message import Message
     >>> print command.process(mlist, Message(), {}, (), None)
     ContinueProcessing.no
 
diff --git a/src/mailman/commands/docs/join.txt b/src/mailman/commands/docs/join.txt
index 9b85e816c..471a2a5b6 100644
--- a/src/mailman/commands/docs/join.txt
+++ b/src/mailman/commands/docs/join.txt
@@ -25,7 +25,7 @@ The mail command 'join' subscribes an email address to the mailing list.
 No address to join
 ------------------
 
-    >>> from mailman.Message import Message
+    >>> from mailman.email.message import Message
     >>> from mailman.app.lifecycle import create_list
     >>> from mailman.queue.command import Results
     >>> mlist = create_list(u'alpha@example.com')
diff --git a/src/mailman/commands/join.py b/src/mailman/commands/join.py
index c14f3142b..81a018cff 100644
--- a/src/mailman/commands/join.py
+++ b/src/mailman/commands/join.py
@@ -61,7 +61,7 @@ example:
             real_name, address = parseaddr(msg['from'])
         # Address could be None or the empty string.
         if not address:
-            address = msg.get_sender()
+            address = msg.sender
         if not address:
             print >> results, _(
                 '$self.name: No valid address found to subscribe')