(joe) code cleanliness

Author: jbylund

locking/dynamolock/dynamolock.py

@@ -9,7 +9,7 @@
 import boto3
 from botocore.errorfactory import ClientError
 
-from .. import BaseLock, CouldNotLockException
+from .. import BaseLock
 
 from .heartbeater import HeartBeater
 
@@ -143,7 +143,7 @@ def acquire(self, blocking=True, timeout=-1):
         while True:
             if not self._locked:
                 try:
-                    retval = self.beat()
+                    self.beat() # we're relying on this to raise a clienterror on conflict
                     self._locked = True
                     self.heartbeater = self.get_heartbeater()
                     self.heartbeater.start()
@@ -160,7 +160,7 @@ def acquire(self, blocking=True, timeout=-1):
             self._wait()
 
     def _create_table(self):
-        response = self.client.create_table(
+        self.client.create_table(
             AttributeDefinitions=[
                 {
                     "AttributeName": "lockname",

locking/dynamolock/heartbeater.py

@@ -12,9 +12,9 @@ def __init__(self, interval=25, heartbeat=lambda: True, exit_flag=None, release=
         """Construct the heartbeater thread object."""
         super(HeartBeater, self).__init__()
         assert exit_flag is not None
-        self.daemon = True # daemon thread so that when the parent exits it will disappear (we're going to try to clean it up anyways)
-        self.interval = interval # this is how frequently to check in
-        self.heartbeat = heartbeat # this is the check-in function
+        self.daemon = True  # daemon thread so that when the parent exits it will disappear (we're going to try to clean it up anyways)
+        self.interval = interval  # this is how frequently to check in
+        self.heartbeat = heartbeat  # this is the check-in function
         self.exit_flag = exit_flag
         self.jitter = 0.1
         self.release = release

locking/filelock/filelock.py

@@ -3,19 +3,18 @@
 import tempfile
 import time
 
-from .. import BaseLock, CouldNotLockException
+from .. import BaseLock
 
 
 class FileLock(BaseLock):
     @staticmethod
     def get_lockdir():
         try:
             tfdir = '/dev/shm'
-            with tempfile.NamedTemporaryFile(dir=tfdir) as tfh:
+            with tempfile.NamedTemporaryFile(dir=tfdir):
                 pass
             return tfdir
-        except Exception as oops:
-            raise
+        except Exception:
             return tempfile.gettempdir()
 
     lockdir = get_lockdir.__func__()

locking/tests/test_locks.py

@@ -1,8 +1,9 @@
-from .. import DynamoLock, FileLock, RedisLock, SocketLock
-import lock_tests
 import threading
 import time
-from _thread import start_new_thread, TIMEOUT_MAX
+from _thread import start_new_thread
+
+import lock_tests
+from .. import DynamoLock, FileLock, RedisLock, SocketLock
 
 RUNNING_ON_CI = True
 # try: