summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoremkael <emkael@tlen.pl>2017-01-05 13:17:18 +0100
committeremkael <emkael@tlen.pl>2017-01-05 13:17:18 +0100
commit8a6b5981795fc65c994d8e42c78f23a6c8d10498 (patch)
treee20c52832c9369d6098cf2460d4c7c9a6a9b652d
parent830aaabd3e8105ad47460628587660cb496f507e (diff)
Refactoring - config loading helper
-rw-r--r--ausbutler/config.py8
-rw-r--r--ausbutler/db.py10
-rw-r--r--butler.py8
3 files changed, 13 insertions, 13 deletions
diff --git a/ausbutler/config.py b/ausbutler/config.py
new file mode 100644
index 0000000..7a0f57d
--- /dev/null
+++ b/ausbutler/config.py
@@ -0,0 +1,8 @@
+from os import path
+import json
+import __main__
+
+def load_config(filename):
+ return json.load(
+ open(path.join(path.dirname(__main__.__file__),
+ 'config', filename + '.json')))
diff --git a/ausbutler/db.py b/ausbutler/db.py
index 940c69d..e40fee5 100644
--- a/ausbutler/db.py
+++ b/ausbutler/db.py
@@ -1,15 +1,11 @@
-import json
-from os import path
-
from sqlalchemy import create_engine
from sqlalchemy.orm import sessionmaker
-import __main__
+from .config import load_config
def get_session():
session = sessionmaker(bind=create_engine(
"mysql://{0[user]}:{0[pass]}@{0[host]}/{0[db]}".format(
- json.load(open(
- path.join(path.dirname(__main__.__file__), 'config', 'db.json')
- )))))
+ load_config('db')
+ )))
return session()
diff --git a/butler.py b/butler.py
index 655a11f..b73674c 100644
--- a/butler.py
+++ b/butler.py
@@ -1,10 +1,6 @@
-import json
-from os import path
-
-import __main__
+from ausbutler.config import load_config
from ausbutler.interface import Interface
-i = Interface(json.load(
- open(path.join(path.dirname(__main__.__file__), 'config', 'butler.json'))))
+i = Interface(load_config('butler'))
i.calculate_all()