Code clean-up based on linking hints

encore/storage/dict_memory_store.py

@@ -18,8 +18,6 @@
 """
 
 from cStringIO import StringIO
-from itertools import izip
-from uuid import uuid4
 import time
 
 from .abstract_store import AbstractStore

encore/storage/file_lock.py

@@ -137,7 +137,7 @@ def release(self):
                 else:
                     f.close()
                     os.remove(self.full_path)
-        except IOError as e:
+        except IOError:
             raise LockError('Releasing an unlocked lock')
 
     def locked(self):
@@ -159,7 +159,7 @@ def acquired(self):
                     return True
                 else:
                     return False
-        except IOError as e:
+        except IOError:
             return False
 
     def force_break(self):

encore/storage/file_value.py

@@ -6,7 +6,6 @@
 #
 
 import os
-import time
 
 from .abstract_store import Value
 
@@ -32,8 +31,6 @@ def _stat(self):
         stat = os.stat(self._path)
         self.size = stat.st_size
         self.created = None
-        #self.created = created if created is not None else time.time()
         self.modified = stat.st_mtime
-        #self.permissions = permissions if permissions is not None else set(['exists', 'get', 'set', 'delete'])
 
 

encore/storage/filesystem_store.py

@@ -18,7 +18,6 @@
 import os
 import json
 import glob
-from itertools import izip
 
 # ETS library imports.
 from .abstract_store import AbstractStore

encore/storage/locking_filesystem_store.py

@@ -38,7 +38,7 @@
 # ETS library imports.
 from .events import StoreSetEvent, StoreUpdateEvent,\
     StoreDeleteEvent, StoreKeyEvent
-from .filesystem_store import FileSystemStore, init_shared_store
+from .filesystem_store import FileSystemStore
 from .file_lock import FileLock
 from .utils import SimpleTransactionContext
 
@@ -193,7 +193,7 @@ def __init__(self, path, force_lock_timeout=10.0,
         try:
             # Create the log file atomically.
             os.close(os.open(self._log_file, os.O_CREAT|os.O_EXCL|os.O_RDWR))
-        except OSError as e:
+        except OSError:
             pass
 
         self._remote_event_poll_interval = remote_event_poll_interval
@@ -326,8 +326,8 @@ def get_modified_keys(self, since):
         timestamp -= self._max_time_delta
         write = False
         modified_keys = []
-        for id,typ,time,key in self._log_iter():
-            if write is False and time > timestamp:
+        for id, typ, mtime, key in self._log_iter():
+            if write is False and mtime > timestamp:
                 write = True
             if write is True:
                 modified_keys.append(key)
@@ -436,7 +436,7 @@ def _remote_event_emit(self):
             if last_emit >= self._remote_event_poll_interval:
                 try:
                     last_log = self._check_remote_event(last_log)
-                except OSError as e:
+                except OSError:
                     # Store got deleted
                     return
                 last_emit -= self._remote_event_poll_interval
@@ -451,7 +451,7 @@ def _check_remote_event(self, id=None):
             with self._locking(self._log_file, recurse=True):
                 try:
                     f = open(self._log_file)
-                except IOError as e:
+                except IOError:
                     return None
                 size = os.stat(self._log_file).st_size
                 f.seek(max(size-1024, 0))
@@ -463,7 +463,7 @@ def _check_remote_event(self, id=None):
             with self._locking(self._log_file, recurse=True):
                 try:
                     f = open(self._log_file)
-                except IOError as e:
+                except IOError:
                     return None
                 text = f.read()
                 seek = self._search_log(id, text)
@@ -474,7 +474,7 @@ def _check_remote_event(self, id=None):
                     try:
                         id, typ, date, time, key = line.split(' ', 4)
                         self._emit_remote_event(id, typ, date, time, key)
-                    except ValueError as e:
+                    except ValueError:
                         pass
         return id
 
@@ -485,7 +485,7 @@ def _search_log(self, id, text):
             return 0
         try:
             return text.index('\n'+id)+1
-        except ValueError as e:
+        except ValueError:
             return -1
 
     def _emit_remote_event(self, id, typ, date, time, key):
@@ -518,7 +518,7 @@ def _log_iter(self):
                     id, typ, date, time, key = line.split(' ', 4)
                     yield int(id), typ, datetime.datetime.strptime(date+' '+time,
                                                          ISO_FORMAT), key
-        except (IOError, ValueError) as e:
+        except (IOError, ValueError):
             pass
 
     def __del__(self):

encore/storage/simple_auth_store.py

@@ -25,7 +25,6 @@
 import hashlib
 
 from .abstract_store import AbstractStore
-from .utils import DummyTransactionContext
 
 class AuthenticationError(Exception):
     pass

encore/storage/sqlite_store.py

@@ -21,7 +21,6 @@
 import cStringIO
 import sqlite3
 import cPickle
-from uuid import uuid4
 import time
 
 from .abstract_store import AbstractStore

encore/storage/static_url_store.py

@@ -33,7 +33,6 @@
 import time
 
 from .abstract_store import AbstractReadOnlyStore
-from .utils import StoreProgressManager, buffer_iterator
 from .events import StoreUpdateEvent, StoreSetEvent, StoreDeleteEvent
 from .url_value import URLValue
 

encore/storage/url_value.py

@@ -7,7 +7,6 @@
 
 import urllib2
 import rfc822
-import time
 
 from .abstract_store import Value
 
@@ -16,7 +15,7 @@ class URLValue(Value):
     def __init__(self, url, metadata=None, opener=None):
         self._url = url
         self._metadata = metadata if metadata is not None else {}
-        self._opener = opener if opener is not None else urlib2.urlopen
+        self._opener = opener if opener is not None else urllib2.urlopen
         self._data_stream = None
         self._size = None
         self._created = None

examples/progress.py

@@ -8,7 +8,6 @@
 
 import time
 import random
-from uuid import uuid4
 from encore.events.api import ProgressManager
 from encore.terminal.api import ProgressDisplay