8 files changed, 26 insertions, 10 deletions

diff --git a/Mailman/Archiver.py b/Mailman/Archiver/Archiver.py
index b6efe66f8..97591f305 100644
--- a/Mailman/Archiver.py
+++ b/Mailman/Archiver/Archiver.py
@@ -24,12 +24,24 @@ archival.
 """
 
 
+#
+# system modules
+#
 import sys, os, string
-import Utils
-import Mailbox
-import mm_cfg
-import sys
 
+#
+# package/project modules
+#
+import Mailman.Utils
+import Mailman.Mailbox
+import Mailman.mm_cfg
+
+#
+# assignments to make them local
+#
+Utils = Mailman.Utils
+Mailbox = Mailman.Mailbox
+mm_cfg = Mailman.mm_cfg
 
 class Archiver:
     def InitVars(self):
diff --git a/Mailman/HyperArch.py b/Mailman/Archiver/HyperArch.py
index 250757d04..f4066800f 100644
--- a/Mailman/HyperArch.py
+++ b/Mailman/Archiver/HyperArch.py
@@ -35,7 +35,8 @@ import re, cgi, urllib, string
 import time, pickle, os, posixfile
 import HyperDatabase
 import pipermail
-import mm_cfg
+import Mailman.mm_cfg
+mm_cfg = Mailman.mm_cfg
 
 
 def html_quote(s):
diff --git a/Mailman/HyperDatabase.py b/Mailman/Archiver/HyperDatabase.py
index a0700773e..2963b0558 100644
--- a/Mailman/HyperDatabase.py
+++ b/Mailman/Archiver/HyperDatabase.py
@@ -25,7 +25,8 @@ import string
 # package/project modules
 #
 import pipermail
-import flock
+import Mailman.flock
+flock = Mailman.flock
 
 CACHESIZE = pipermail.CACHESIZE
 
diff --git a/Mailman/Archiver/__init__.py b/Mailman/Archiver/__init__.py
new file mode 100644
index 000000000..cee5c9787
--- /dev/null
+++ b/Mailman/Archiver/__init__.py
@@ -0,0 +1,2 @@
+
+from Archiver import *
diff --git a/Mailman/pipermail.py b/Mailman/Archiver/pipermail.py
index c4bdec1cb..c4bdec1cb 100644
--- a/Mailman/pipermail.py
+++ b/Mailman/Archiver/pipermail.py
diff --git a/Mailman/Makefile.in b/Mailman/Makefile.in
index 16bc7ae3b..9928c06fd 100644
--- a/Mailman/Makefile.in
+++ b/Mailman/Makefile.in
@@ -42,7 +42,7 @@ PACKAGEDIR= 	$(prefix)/Mailman
 SHELL=		/bin/sh
 
 MODULES=	*.py
-SUBDIRS=	Cgi Logging
+SUBDIRS=	Cgi Logging Archiver
 
 # Modes for directories and executables created by the install
 # process.  Default to group-writable directories but
diff --git a/Makefile.in b/Makefile.in
index d66957eca..061f6ee93 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -43,7 +43,7 @@ CFLAGS=		$(OPT) $(DEFS)
 
 ARCH_INDEP_DIRS=	public_html public_html/archives logs archives bin \
 archives/private archives/public lists locks templates scripts filters \
-cron data Mailman Mailman/Cgi Mailman/Logging
+cron data Mailman Mailman/Cgi Mailman/Logging Mailman/Archiver
 ARCH_DEP_DIRS=	cgi-bin mail
 
 # Directories make should decend into
diff --git a/configure b/configure
index c5934fa97..d88fbd3ac 100755
--- a/configure
+++ b/configure
@@ -1874,7 +1874,7 @@ ac_given_INSTALL="$INSTALL"
 trap 'rm -fr `echo "misc/paths.py Mailman/Defaults.py Mailman/mm_cfg.py
            src/Makefile misc/Makefile bin/Makefile
 	   Mailman/Makefile Mailman/Cgi/Makefile Mailman/Logging/Makefile
-	   mail/Makefile templates/Makefile cron/Makefile
+	   Mailman/Archiver/Makefile mail/Makefile templates/Makefile cron/Makefile
 	   filters/Makefile scripts/Makefile
 	   cron/crontab.in Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
 EOF
@@ -1965,7 +1965,7 @@ cat >> $CONFIG_STATUS <<EOF
 CONFIG_FILES=\${CONFIG_FILES-"misc/paths.py Mailman/Defaults.py Mailman/mm_cfg.py
            src/Makefile misc/Makefile bin/Makefile
 	   Mailman/Makefile Mailman/Cgi/Makefile Mailman/Logging/Makefile
-	   mail/Makefile templates/Makefile cron/Makefile
+	   Mailman/Archiver/Makefile mail/Makefile templates/Makefile cron/Makefile
 	   filters/Makefile scripts/Makefile
 	   cron/crontab.in Makefile"}
 EOF