X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=server.py;h=6946a40a3807d2da454e4316c2a2bc62e8f3eeb9;hb=82588a08467eada0fd7e41ecfdfed9f1fde93ce5;hp=0b137338de0526429898c76be835a2f41995be6c;hpb=638b04908c8a25b8e40511eb5b5b6c0fce99b99a;p=electrum-server.git

diff --git a/server.py b/server.py
index 0b13733..6946a40 100755
--- a/server.py
+++ b/server.py
@@ -33,17 +33,17 @@ config.add_section('database')
 config.set('database', 'type', 'psycopg2')
 config.set('database', 'database', 'abe')
 
-try:
-    f = open('/etc/electrum.conf','r')
-    config.readfp(f)
-    f.close()
-except:
-    print "Could not read electrum.conf. I will use the default values."
+for path in ('', '/etc/'):
+    filename = path + 'electrum.conf'
+    try:
+        with open(filename, 'r') as f:
+            config.readfp(f)
+    except:
+        print "Could not read %s. Falling back." % filename
 
 try:
-    f = open('/etc/electrum.banner','r')
-    config.set('server','banner', f.read())
-    f.close()
+    with open('/etc/electrum.banner', 'r') as f:
+        config.set('server','banner', f.read())
 except:
     pass
 
@@ -64,7 +64,8 @@ from transports.native import NativeServer
 
 from modules.irc import ServerProcessor
 if use_libbitcoin:
-    from modules.python_bitcoin import LibBitcoinProcessor as BlockchainProcessor
+    from modules.python_bitcoin \
+        import LibbitcoinProcessor as BlockchainProcessor
 else:
     from modules.abe import AbeProcessor as BlockchainProcessor