summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Mailman/Archiver/Archiver.py12
-rw-r--r--Mailman/Archiver/HyperArch.py3
-rw-r--r--Mailman/Archiver/HyperDatabase.py3
3 files changed, 5 insertions, 13 deletions
diff --git a/Mailman/Archiver/Archiver.py b/Mailman/Archiver/Archiver.py
index 97591f305..c2be60252 100644
--- a/Mailman/Archiver/Archiver.py
+++ b/Mailman/Archiver/Archiver.py
@@ -32,16 +32,10 @@ import sys, os, string
#
# package/project modules
#
-import Mailman.Utils
-import Mailman.Mailbox
-import Mailman.mm_cfg
+from Mailman import Utils
+from Mailman import Mailbox
+from Mailman import 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/Archiver/HyperArch.py b/Mailman/Archiver/HyperArch.py
index f4066800f..1f32c2870 100644
--- a/Mailman/Archiver/HyperArch.py
+++ b/Mailman/Archiver/HyperArch.py
@@ -35,8 +35,7 @@ import re, cgi, urllib, string
import time, pickle, os, posixfile
import HyperDatabase
import pipermail
-import Mailman.mm_cfg
-mm_cfg = Mailman.mm_cfg
+from Mailman import mm_cfg
def html_quote(s):
diff --git a/Mailman/Archiver/HyperDatabase.py b/Mailman/Archiver/HyperDatabase.py
index 2963b0558..8fc3808bc 100644
--- a/Mailman/Archiver/HyperDatabase.py
+++ b/Mailman/Archiver/HyperDatabase.py
@@ -25,8 +25,7 @@ import string
# package/project modules
#
import pipermail
-import Mailman.flock
-flock = Mailman.flock
+from Mailman import flock
CACHESIZE = pipermail.CACHESIZE