2 files changed, 4 insertions, 6 deletions

diff --git a/mailman/database/mailinglist.py b/mailman/database/mailinglist.py
index eac8ad05d..56caea296 100644
--- a/mailman/database/mailinglist.py
+++ b/mailman/database/mailinglist.py
@@ -22,7 +22,6 @@ from storm.locals import *
 from urlparse import urljoin
 from zope.interface import implements
 
-from mailman import Defaults
 from mailman.Utils import fqdn_listname, makedirs, split_listname
 from mailman.config import config
 from mailman.database import roster
@@ -206,8 +205,7 @@ class MailingList(Model):
         domain = config.domains[self.host_name]
         # XXX Handle the case for when context is not None; those would be
         # relative URLs.
-        return urljoin(domain.base_url,
-                       target + Defaults.CGIEXT + '/' + self.fqdn_listname)
+        return urljoin(domain.base_url, target + '/' + self.fqdn_listname)
 
     @property
     def data_path(self):
@@ -253,7 +251,7 @@ class MailingList(Model):
         return '%s-unsubscribe@%s' % (self.list_name, self.host_name)
 
     def confirm_address(self, cookie):
-        template = string.Template(Defaults.VERP_CONFIRM_FORMAT)
+        template = string.Template(config.mta.verp_confirm_format)
         local_part = template.safe_substitute(
             address = '%s-confirm' % self.list_name,
             cookie  = cookie)
diff --git a/mailman/database/pending.py b/mailman/database/pending.py
index 07e594253..6fe66f5fd 100644
--- a/mailman/database/pending.py
+++ b/mailman/database/pending.py
@@ -29,11 +29,11 @@ import random
 import hashlib
 import datetime
 
+from lazr.config import as_timedelta
 from storm.locals import *
 from zope.interface import implements
 from zope.interface.verify import verifyObject
 
-from mailman import Defaults
 from mailman.config import config
 from mailman.database.model import Model
 from mailman.interfaces.pending import (
@@ -87,7 +87,7 @@ class Pendings:
         verifyObject(IPendable, pendable)
         # Calculate the token and the lifetime.
         if lifetime is None:
-            lifetime = Defaults.PENDING_REQUEST_LIFE
+            lifetime = as_timedelta(config.pending_request_life)
         # Calculate a unique token.  Algorithm vetted by the Timbot.  time()
         # has high resolution on Linux, clock() on Windows.  random gives us
         # about 45 bits in Python 2.2, 53 bits on Python 2.3.  The time and