renamed Storage into FileStorage

batcave.py

@@ -14,7 +14,7 @@ from ffstatus import \
     ApiServer, \
     AlfredParser, BatmanParser, \
     DashingClient, GraphitePush, \
-    Storage
+    FileStorage
 from ffstatus.exceptions import SanityCheckError
 
 BATCAVE = 'Batman/Alfred Transmission Collection, Aggregation & Value Engine'
@@ -90,7 +90,7 @@ def main():
     logger = prepare_logging(args)
     logger.info('Starting up')
 
-    storage = Storage(args.storage_dir)
+    storage = FileStorage(args.storage_dir)
     storage.open()
     logger.info('Storage: ' + str(storage))
 

ffstatus/__init__.py

@@ -12,12 +12,12 @@ from .batman import BatmanParser
 from .dashing import DashingClient
 from .graphite import GraphitePush
 from .server import ApiServer
-from .storage import Storage
+from .filestorage import FileStorage
 
 __all__ = [
     'AlfredParser', 'BatmanParser',
     'DashingClient', 'GraphitePush',
-    'Storage', 'ApiServer',
+    'FileStorage', 'ApiServer',
     'dict_merge', 'merge_alfred_batman',
     'resolve_ipblock', 'mac2id',
 ]

ffstatus/storage.py → ffstatus/filestorage.py

@@ -9,7 +9,7 @@ import shutil
 from .basestorage import BaseStorage
 
 
-class Storage(BaseStorage):
+class FileStorage(BaseStorage):
     """Provides file-based persistency for BaseStorage"""
 
     def __init__(self, storage_dir):