Merge pull request #60 from lindleywhite/master

Remove tabs, and add conf file

4 files changed, 16 insertions, 14 deletions

diff --git a/bin/emq-router b/bin/emq-router
index 425a985..e6448e8 100755
--- a/bin/emq-router
+++ b/bin/emq-router
@@ -3,18 +3,19 @@
 import argparse
 
 from eventmq.log import setup_logger
+from eventmq import conf
 from eventmq.router import Router
 
 if __name__ == "__main__":
-        parser = argparse.ArgumentParser(
-            description='Route job messages to their appropriate queues')
-        parser.add_argument('--config', '-C', type=str, nargs='?',
+    parser = argparse.ArgumentParser(
+        description='Route job messages to their appropriate queues')
+    parser.add_argument('--config', '-C', type=str, nargs='?',
                         help='manually specify the location of eventmq.conf')
 
-        args = parser.parse_args()
+    args = parser.parse_args()
 
-        if args.config:
-            conf.CONFIG_FILE = args.config
+    if args.config:
+        conf.CONFIG_FILE = args.config
 
     r = Router()
     r.router_main()
diff --git a/bin/emq-scheduler b/bin/emq-scheduler
index 31f7152..3286c63 100755
--- a/bin/emq-scheduler
+++ b/bin/emq-scheduler
@@ -1,18 +1,19 @@
 #!/usr/bin/env python
 # -*- mode: python -*-
 import argparse
+from eventmq import conf
 from eventmq.scheduler import Scheduler
 
 if __name__ == "__main__":
-        parser = argparse.ArgumentParser(
-            description='Listen for scheduled jobs and run them')
-        parser.add_argument('--config', '-C', type=str, nargs='?',
+    parser = argparse.ArgumentParser(
+        description='Listen for scheduled jobs and run them')
+    parser.add_argument('--config', '-C', type=str, nargs='?',
                         help='manually specify the location of eventmq.conf')
 
-        args = parser.parse_args()
+    args = parser.parse_args()
 
-        if args.config:
-            conf.CONFIG_FILE = args.config
+    if args.config:
+        conf.CONFIG_FILE = args.config
 
     s = Scheduler()
     s.scheduler_main()
diff --git a/eventmq/__init__.py b/eventmq/__init__.py
index 7401a56..aefc3a2 100644
--- a/eventmq/__init__.py
+++ b/eventmq/__init__.py
@@ -1,5 +1,5 @@
 __author__ = 'EventMQ Contributors'
-__version__ = '0.3.5.4'
+__version__ = '0.3.5.6'
 
 PROTOCOL_VERSION = 'eMQP/1.0'
 
diff --git a/setup.py b/setup.py
index e1d83c8..64afbd9 100644
--- a/setup.py
+++ b/setup.py
@@ -7,7 +7,7 @@ from setuptools import find_packages, setup
 
 setup(
     name='eventmq',
-    version='0.3.5.4',
+    version='0.3.5.6',
     description='EventMQ job execution and messaging system based on ZeroMQ',
     packages=find_packages(),
     install_requires=['pyzmq==15.4.0',