summaryrefslogtreecommitdiff
path: root/mailman/database/pending.py
diff options
context:
space:
mode:
authorBarry Warsaw2009-01-01 17:58:39 -0500
committerBarry Warsaw2009-01-01 17:58:39 -0500
commit1c285f110d8e98597453c6b4b69ea01163033547 (patch)
tree00c7ec16711b2073e40f593658f652726a9d4231 /mailman/database/pending.py
parent12513c7d0fc1f5d2a1aabda349637309f6e8300b (diff)
parent600ddb503a391d70230d96ee91a631888d11b35a (diff)
downloadmailman-1c285f110d8e98597453c6b4b69ea01163033547.tar.gz
mailman-1c285f110d8e98597453c6b4b69ea01163033547.tar.zst
mailman-1c285f110d8e98597453c6b4b69ea01163033547.zip
Diffstat (limited to 'mailman/database/pending.py')
-rw-r--r--mailman/database/pending.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/mailman/database/pending.py b/mailman/database/pending.py
index 31cc4e285..ff794c83c 100644
--- a/mailman/database/pending.py
+++ b/mailman/database/pending.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2008 by the Free Software Foundation, Inc.
+# Copyright (C) 2007-2009 by the Free Software Foundation, Inc.
#
# This file is part of GNU Mailman.
#
@@ -27,7 +27,8 @@ from storm.locals import *
from zope.interface import implements
from zope.interface.verify import verifyObject
-from mailman.configuration import config
+from mailman import Defaults
+from mailman.config import config
from mailman.database.model import Model
from mailman.interfaces import (
IPendable, IPended, IPendedKeyValue, IPendings)
@@ -79,7 +80,7 @@ class Pendings(object):
verifyObject(IPendable, pendable)
# Calculate the token and the lifetime.
if lifetime is None:
- lifetime = config.PENDING_REQUEST_LIFE
+ lifetime = Defaults.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