Packagized

1 files changed, 13 insertions, 9 deletions

diff --git a/scripts/post b/scripts/post
index 24184664b..2566ba790 100755
--- a/scripts/post
+++ b/scripts/post
@@ -31,10 +31,14 @@ thus should not be re-posted to news if the list gates to a newsgroup.
 
 import sys
 import paths
-import maillist, mm_message, mm_err, mm_cfg, mm_utils
+from Mailman import MailList
+from Mailman import Message
+from Mailman import Errors
+from Mailman import Utils
+
 
 try:
-    sys.stderr = mm_utils.StampedLogger("error", label = 'post',
+    sys.stderr = Utils.StampedLogger("error", label = 'post',
                                         manual_reprime=1, nofail=0)
 except IOError:
     pass                        # Oh well - SOL on redirect, errors show thru.
@@ -42,7 +46,7 @@ except IOError:
 # Only let one program run at once per list.
 
 # TODO: This can fail, and should send back an error message when it does.
-current_list = maillist.MailList(sys.argv[1])
+current_list = MailList.MailList(sys.argv[1])
 if len(sys.argv) > 2:
     current_list.tmp_prevent_gate = 1
 else:
@@ -59,16 +63,16 @@ try:
 	    text = sys.stdin.read()
     else:
 	text = sys.stdin.read()
-    msg = mm_message.IncomingMessage(text)
+    msg = Message.IncomingMessage(text)
 
     try:
 	current_list.Post(msg)
-    except mm_err.MMNeedApproval, err_msg:
+    except Errors.MMNeedApproval, err_msg:
 	if (current_list.dont_respond_to_post_requests
-            or err_msg == mm_err.MODERATED_LIST_MSG
-            or err_msg == mm_err.IMPLICIT_DEST_MSG
-            or err_msg == mm_err.SUSPICIOUS_HEADER_MSG
-            or err_msg == mm_err.FORBIDDEN_SENDER_MSG):
+            or err_msg == Errors.MODERATED_LIST_MSG
+            or err_msg == Errors.IMPLICIT_DEST_MSG
+            or err_msg == Errors.SUSPICIOUS_HEADER_MSG
+            or err_msg == Errors.FORBIDDEN_SENDER_MSG):
             # Do not send hold-for-approval notices for moderated messages
 	    # or potential spam.
             current_list.Unlock()