Rename fake_local to vtable, move to separate file

diff --git a/python/londiste/handlers/__init__.py b/python/londiste/handlers/__init__.py
index 66853d752c1b29559222ac2faaba8bae1d35ec6c..764518efa476268adbe068e55112628e81c67d62 100644 (file)
--- a/python/londiste/handlers/__init__.py
+++ b/python/londiste/handlers/__init__.py
@@ -3,12 +3,14 @@ import new
 import sys
 
 DEFAULT_HANDLERS = [
-    'londiste.handlers.bulk',
     'londiste.handlers.qtable',
-    'londiste.handlers.dispatch',
     'londiste.handlers.applyfn',
     'londiste.handlers.part',
     'londiste.handlers.multimaster',
+    'londiste.handlers.vtable',
+
+    'londiste.handlers.bulk',
+    'londiste.handlers.dispatch',
 ]
 
 def handler_args(name, cls):

diff --git a/python/londiste/handlers/qtable.py b/python/londiste/handlers/qtable.py
index 443d2496803cbf5ab12bc68d161bd90bea5e22b3..b904e0e1c460584c7882317fad5cec4bfe836fae 100644 (file)
--- a/python/londiste/handlers/qtable.py
+++ b/python/londiste/handlers/qtable.py
@@ -16,7 +16,7 @@ from londiste.handler import BaseHandler
 
 import pgq
 
-__all__ = ['QueueTableHandler', 'FakeLocalHandler', 'QueueSplitterHandler']
+__all__ = ['QueueTableHandler', 'QueueSplitterHandler']
 
 
 class QueueTableHandler(BaseHandler):
@@ -36,17 +36,6 @@ class QueueTableHandler(BaseHandler):
     def needs_table(self):
         return False
 
-class FakeLocalHandler(BaseHandler):
-    handler_name = 'fake_local'
-
-    def add(self, trigger_arg_list):
-        trigger_arg_list.append('virtual_table')
-
-    def needs_table(self):
-        return False
-
-
-
 class QueueSplitterHandler(BaseHandler):
     handler_name = 'qsplitter'
 
@@ -89,5 +78,4 @@ class QueueSplitterHandler(BaseHandler):
         return False
 
 
-__londiste_handlers__ = [QueueTableHandler, FakeLocalHandler,
-                         QueueSplitterHandler]
+__londiste_handlers__ = [QueueTableHandler, QueueSplitterHandler]

diff --git a/python/londiste/handlers/vtable.py b/python/londiste/handlers/vtable.py
new file mode 100644 (file)
index 0000000..2f5fd55
--- /dev/null
+++ b/python/londiste/handlers/vtable.py
@@ -0,0 +1,25 @@
+"""Virtual Table.
+"""
+
+from londiste.handler import BaseHandler
+
+__all__ = ['VirtualTableHandler', 'FakeLocalHandler']
+
+class VirtualTableHandler(BaseHandler):
+    """Virtual Table.
+
+    """
+    handler_name = 'vtable'
+
+    def add(self, trigger_arg_list):
+        trigger_arg_list.append('virtual_table')
+
+    def needs_table(self):
+        return False
+
+class FakeLocalHandler(VirtualTableHandler):
+    """Deprecated compat name for vtable."""
+    handler_name = 'fake_local'
+
+__londiste_handlers__ = [VirtualTableHandler, FakeLocalHandler]
+