Correct Exception Type for SocketLock (#24)

Author: jbylund

locking/__init__.py

@@ -1,13 +1,15 @@
 """
 xxx
 """
+from .custom_exceptions import CouldNotLockException
 from .baselock import BaseLock
 from .filelock import FileLock
 from .socketlock import SocketLock
 from .utils import get_caller
 
 outgoing = [
     BaseLock,
+    CouldNotLockException,
     FileLock,
     get_caller,
     SocketLock,

locking/baselock.py

@@ -3,14 +3,11 @@
 import time
 
 from .utils import get_caller
+from .custom_exceptions import CouldNotLockException
 
 TIMEOUT_MAX = int(sys.maxsize / 10**9)
 
 
-class CouldNotLockException(Exception):
-    pass
-
-
 class BaseLock:
     def __init__(self, lockname=None, block=True):
         self.lockname = lockname or get_caller()

locking/socketlock/socketlock.py

@@ -4,7 +4,7 @@
 import socket
 import time
 
-from .. import BaseLock
+from .. import BaseLock, CouldNotLockException
 
 
 class SocketLock(BaseLock):
@@ -45,7 +45,7 @@ def acquire(self, blocking=True, timeout=-1):
                                 return False
                     time.sleep(random.random() * 0.005)
                 else:
-                    raise
+                    raise CouldNotLockException()
 
     def release(self):
         """Release the lock."""

locking/tests/test_locks.py

@@ -3,6 +3,7 @@
 import time
 from _thread import start_new_thread
 from .. import FileLock, SocketLock
+from ..custom_exceptions import CouldNotLockException
 
 try:
     # try to import lock_tests as if it has been distributed with cpython
@@ -37,6 +38,11 @@ def test_at_fork_reinit(self):
 class SocketLockTests(LockTClass):
     locktype = staticmethod(SocketLock)
 
+    def test_raises_right_exception(self):
+        with SocketLock(lockname="uniquename"):
+            with self.assertRaises(CouldNotLockException):
+                with SocketLock(lockname="uniquename"):
+                    pass
 
 class FileLockTests(LockTClass):
     locktype = staticmethod(FileLock)