summaryrefslogtreecommitdiff
path: root/ausbutler
diff options
context:
space:
mode:
authoremkael <emkael@tlen.pl>2017-01-04 00:36:51 +0100
committeremkael <emkael@tlen.pl>2017-01-04 20:56:22 +0100
commitb231002cd6bd5df74867627576a75c510b41e1f1 (patch)
treea785cffaceaa6a282ee9a1ad2d18052b117f8f99 /ausbutler
parenta992859c23b9fe33d2623f5ec53c58c48699ed05 (diff)
Import sort
Diffstat (limited to 'ausbutler')
-rw-r--r--ausbutler/db.py3
-rw-r--r--ausbutler/interface.py5
-rw-r--r--ausbutler/model.py1
3 files changed, 6 insertions, 3 deletions
diff --git a/ausbutler/db.py b/ausbutler/db.py
index c813b58..a53a273 100644
--- a/ausbutler/db.py
+++ b/ausbutler/db.py
@@ -1,10 +1,11 @@
import json
from os import path
-import __main__
from sqlalchemy import create_engine, event
from sqlalchemy.orm import sessionmaker
+import __main__
+
config = json.load(
open(path.join(path.dirname(__main__.__file__), 'config', 'db.json')))
engine = create_engine(
diff --git a/ausbutler/interface.py b/ausbutler/interface.py
index cd8df45..94b61e4 100644
--- a/ausbutler/interface.py
+++ b/ausbutler/interface.py
@@ -1,7 +1,8 @@
+import re
+
+from .butler import cutoff, get_opponents, get_room, normalize
from .db import Session
from .model import AusButler, Butler
-from .butler import cutoff, get_opponents, get_room, normalize
-import re
class Interface:
diff --git a/ausbutler/model.py b/ausbutler/model.py
index 89c7701..cb17ce9 100644
--- a/ausbutler/model.py
+++ b/ausbutler/model.py
@@ -2,6 +2,7 @@ from cached_property import cached_property
from sqlalchemy import Column, ForeignKey, MetaData, Table, func
from sqlalchemy.ext.declarative import declarative_base
from sqlalchemy.types import Float, Integer
+
from .db import Session
Base = declarative_base()