relax json rules for 0.43 clients. do not add None to subscriptions list in session

[electrum-server.git] / server.py

diff --git a/server.py b/server.py
index 71878cd..4de3c90 100755 (executable)
--- a/server.py
+++ b/server.py
@@ -29,7 +29,7 @@ def create_config():
     config = ConfigParser.ConfigParser()
     # set some defaults, which will be overwritten by the config file
     config.add_section('server')
-    config.set('server','banner', 'Welcome to Electrum!')
+    config.set('server', 'banner', 'Welcome to Electrum!')
     config.set('server', 'host', 'localhost')
     config.set('server', 'native_port', '50000')
     config.set('server', 'stratum_tcp_port', '50001')
@@ -80,25 +80,25 @@ if __name__ == '__main__':
     from transports.stratum_tcp import TcpServer
     from transports.native import NativeServer
 
-    from modules.irc import ServerProcessor
+    from backends.irc import ServerProcessor
     backend_name = config.get('server', 'backend')
     if backend_name == "libbitcoin":
         # NativeServer cannot be used with libbitcoin
         native_port = None
         config.set('server', 'native_port', '')
-        from modules.python_bitcoin import BlockchainProcessor
-    elif backend_name == "abe":
-        from modules.abe import AbeProcessor as BlockchainProcessor
-    else:
-        sys.stderr.write('Unknown backend specified\n')
-        sys.exit(-1)
+    try:
+        backend = __import__("backends." + backend_name,
+                             fromlist=["BlockchainProcessor"])
+    except ImportError:
+        sys.stderr.write("Unknown backend '%s' specified\n" % backend_name)
+        raise
 
     # Create hub
     dispatcher = Dispatcher()
     shared = dispatcher.shared
 
     # Create and register processors
-    chain_proc = BlockchainProcessor(config)
+    chain_proc = backend.BlockchainProcessor(config)
     dispatcher.register('blockchain', chain_proc)
 
     server_proc = ServerProcessor(config)