Upgrade from using the locknix package to using flufl.lock.

2 files changed, 5 insertions, 6 deletions

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):