Invert PyminDaemon constructor options and add defaults.

It's more likely to just want to override the routes and not the addr.

diff --git a/pymin b/pymin
index 829b9a5d9580fe928289cec487838546ccf54b36..37feab9243c9b201251f6add59aa7227c214dc68 100755 (executable)
--- a/pymin
+++ b/pymin
@@ -4,5 +4,5 @@
 from pymindaemon import PyminDaemon
 import config
 
 from pymindaemon import PyminDaemon
 import config
 

-PyminDaemon(config.bind_addr, config.routes).run()
+PyminDaemon(config.routes, config.bind_addr).run()

 
 

diff --git a/pymindaemon.py b/pymindaemon.py
index 98ced487f572d76201b10703d1d5065ae89c1083..c3fdda68674fffd65b589181f153b60d4d094d84 100644 (file)
--- a/pymindaemon.py
+++ b/pymindaemon.py
@@ -33,7 +33,7 @@ class PyminDaemon(eventloop.EventLoop):
     >>> PyminDaemon(('', 9999), dict(test=test_handler)).run()
     """
 
     >>> PyminDaemon(('', 9999), dict(test=test_handler)).run()
     """
 

-    def __init__(self, bind_addr, routes):
+    def __init__(self, routes=dict(), bind_addr=('', 9999)):

         r"""Initialize the PyminDaemon object.
 
         See PyminDaemon class documentation for more info.
         r"""Initialize the PyminDaemon object.
 
         See PyminDaemon class documentation for more info.


@@ -94,5 +94,5 @@ if __name__ == '__main__':
         print 'echo:', message
         return message
 
         print 'echo:', message
         return message
 

-    PyminDaemon(('', 9999), dict(test=test_handler, echo=echo_handler)).run()
+    PyminDaemon(dict(test=test_handler, echo=echo_handler)).run()