11 files changed, 22 insertions, 23 deletions

diff --git a/setup.py b/setup.py
index aaa7a1814..fac622d18 100644
--- a/setup.py
+++ b/setup.py
@@ -96,10 +96,10 @@ case second `m'.  Any other spelling is incorrect.""",
         'argparse',
         'flufl.enum',
         'flufl.i18n',
+        'flufl.lock',
         'httplib2',
         'lazr.config',
         'lazr.smtptest',
-        'locknix',
         'restish',
         'storm',
         'zc.buildout',
diff --git a/src/mailman/Archiver/HyperArch.py b/src/mailman/Archiver/HyperArch.py
index 11b28ae48..e851085b7 100644
--- a/src/mailman/Archiver/HyperArch.py
+++ b/src/mailman/Archiver/HyperArch.py
@@ -34,14 +34,13 @@ import time
 import errno
 import urllib
 import logging
-import weakref
 import binascii
 
 from email.Charset import Charset
 from email.Errors import HeaderParseError
 from email.Header import decode_header, make_header
+from flufl.lock import Lock, TimeOutError
 from lazr.config import as_boolean
-from locknix.lockfile import Lock
 from string import Template
 from zope.component import getUtility
 
@@ -751,7 +750,7 @@ class HyperArchive(pipermail.T):
                          self.maillist.fqdn_listname + '-arch.lock'))
         try:
             self._lock_file.lock(timeout=0.5)
-        except lockfile.TimeOutError:
+        except TimeOutError:
             return 0
         return 1
 
diff --git a/src/mailman/Archiver/HyperDatabase.py b/src/mailman/Archiver/HyperDatabase.py
index f1884f019..2092ef507 100644
--- a/src/mailman/Archiver/HyperDatabase.py
+++ b/src/mailman/Archiver/HyperDatabase.py
@@ -27,7 +27,7 @@ import errno
 # package/project modules
 #
 import pipermail
-from locknix import lockfile
+from flufl.lock import Lock, NotLockedError
 
 CACHESIZE = pipermail.CACHESIZE
 
@@ -58,7 +58,7 @@ class DumbBTree:
     def __init__(self, path):
         self.current_index = 0
         self.path = path
-        self.lockfile = lockfile.Lock(self.path + ".lock")
+        self.lockfile = Lock(self.path + ".lock")
         self.lock()
         self.__dirty = 0
         self.dict = {}
@@ -80,7 +80,7 @@ class DumbBTree:
     def unlock(self):
         try:
             self.lockfile.unlock()
-        except lockfile.NotLockedError:
+        except NotLockedError:
             pass
 
     def __delitem__(self, item):
diff --git a/src/mailman/bin/arch.py b/src/mailman/bin/arch.py
index 713af1013..c966f4e09 100644
--- a/src/mailman/bin/arch.py
+++ b/src/mailman/bin/arch.py
@@ -23,7 +23,7 @@ import errno
 import shutil
 import optparse
 
-from locknix.lockfile import Lock
+from flufl.lock import Lock
 
 from mailman.Archiver.HyperArch import HyperArchive
 from mailman.Defaults import hours
diff --git a/src/mailman/bin/gate_news.py b/src/mailman/bin/gate_news.py
index c10248c53..bb293a75f 100644
--- a/src/mailman/bin/gate_news.py
+++ b/src/mailman/bin/gate_news.py
@@ -25,7 +25,7 @@ import optparse
 import email.Errors
 
 from email.Parser import Parser
-from locknix import lockfile
+from flufl.lock import Lock, TimeOutError
 
 from mailman import MailList
 from mailman import Message
@@ -209,7 +209,7 @@ def process_lists(glock):
                         # loop over range, and this will not include the last
                         # element in the list.
                         poll_newsgroup(mlist, conn, start, last + 1, glock)
-            except lockfile.TimeOutError:
+            except TimeOutError:
                 log.error('Could not acquire list lock: %s', listname)
         finally:
             if mlist.Locked():
@@ -230,12 +230,12 @@ def main():
     log = logging.getLogger('mailman.fromusenet')
 
     try:
-        with lockfile.Lock(GATENEWS_LOCK_FILE,
-                           # It's okay to hijack this
-                           lifetime=LOCK_LIFETIME) as lock:
+        with Lock(GATENEWS_LOCK_FILE,
+                  # It's okay to hijack this
+                  lifetime=LOCK_LIFETIME) as lock:
             process_lists(lock)
         clearcache()
-    except lockfile.TimeOutError:
+    except TimeOutError:
         log.error('Could not acquire gate_news lock')
 
 
diff --git a/src/mailman/bin/master.py b/src/mailman/bin/master.py
index 0d0276fdb..263d65a39 100644
--- a/src/mailman/bin/master.py
+++ b/src/mailman/bin/master.py
@@ -34,8 +34,8 @@ import logging
 
 from datetime import timedelta
 from flufl.enum import Enum
+from flufl.lock import Lock, TimeOutError
 from lazr.config import as_boolean
-from locknix import lockfile
 
 from mailman.config import config
 from mailman.core.i18n import _
@@ -165,11 +165,11 @@ def acquire_lock_1(force):
     :return: The master queue runner lock.
     :raises: `TimeOutError` if the lock could not be acquired.
     """
-    lock = lockfile.Lock(config.LOCK_FILE, LOCK_LIFETIME)
+    lock = Lock(config.LOCK_FILE, LOCK_LIFETIME)
     try:
         lock.lock(timedelta(seconds=0.1))
         return lock
-    except lockfile.TimeOutError:
+    except TimeOutError:
         if not force:
             raise
         # Force removal of lock first.
@@ -191,7 +191,7 @@ def acquire_lock(force):
     try:
         lock = acquire_lock_1(force)
         return lock
-    except lockfile.TimeOutError:
+    except TimeOutError:
         status = master_state()
         if status == WatcherState.conflict:
             # Hostname matches and process exists.
diff --git a/src/mailman/bin/update.py b/src/mailman/bin/update.py
index c4f7f0cf1..3ec6d7427 100644
--- a/src/mailman/bin/update.py
+++ b/src/mailman/bin/update.py
@@ -26,7 +26,7 @@ import cPickle
 import marshal
 import optparse
 
-from locknix.lockfile import TimeOutError
+from flufl.lock import TimeOutError
 
 from mailman import MailList
 from mailman import Message
diff --git a/src/mailman/database/stock.py b/src/mailman/database/stock.py
index e3c802455..92a344171 100644
--- a/src/mailman/database/stock.py
+++ b/src/mailman/database/stock.py
@@ -25,7 +25,7 @@ __all__ = [
 import os
 import logging
 
-from locknix.lockfile import Lock
+from flufl.lock import Lock
 from lazr.config import as_boolean
 from pkg_resources import resource_string
 from storm.cache import GenerationalCache
diff --git a/src/mailman/mta/postfix.py b/src/mailman/mta/postfix.py
index 0c4604ae5..59252f56d 100644
--- a/src/mailman/mta/postfix.py
+++ b/src/mailman/mta/postfix.py
@@ -29,7 +29,7 @@ import os
 import logging
 import datetime
 
-from locknix.lockfile import Lock
+from flufl.lock import Lock
 from zope.component import getUtility
 from zope.interface import implements
 
diff --git a/src/mailman/pipeline/scrubber.py b/src/mailman/pipeline/scrubber.py
index c9c7a3f6d..841936e3f 100644
--- a/src/mailman/pipeline/scrubber.py
+++ b/src/mailman/pipeline/scrubber.py
@@ -34,8 +34,8 @@ import binascii
 
 from email.charset import Charset
 from email.utils import make_msgid, parsedate
+from flufl.lock import Lock
 from lazr.config import as_boolean
-from locknix.lockfile import Lock
 from mimetypes import guess_all_extensions
 from string import Template
 from zope.interface import implements
diff --git a/src/mailman/queue/archive.py b/src/mailman/queue/archive.py
index 42a3d301a..542b5ad5c 100644
--- a/src/mailman/queue/archive.py
+++ b/src/mailman/queue/archive.py
@@ -28,8 +28,8 @@ import logging
 
 from datetime import datetime
 from email.Utils import parsedate_tz, mktime_tz, formatdate
+from flufl.lock import Lock
 from lazr.config import as_timedelta
-from locknix.lockfile import Lock
 
 from mailman.config import config
 from mailman.queue import Runner