diff --git a/edbob/db/__init__.py b/edbob/db/__init__.py index 3ffb237..84f0d42 100644 --- a/edbob/db/__init__.py +++ b/edbob/db/__init__.py @@ -35,9 +35,6 @@ from sqlalchemy.ext.declarative import declarative_base import edbob -# __all__ = ['engines', 'engine', 'Session', 'metadata', -# 'get_setting', 'save_setting'] - __all__ = ['engines', 'engine', 'Session', 'get_setting', 'save_setting'] inited = False @@ -45,7 +42,6 @@ engines = None engine = None Session = sessionmaker() Base = declarative_base(cls=edbob.Object) -# metadata = None def init(config): @@ -71,14 +67,10 @@ def init(config): """ import edbob.db - # from edbob.db import classes from edbob.db import model from edbob.db import enum - # from edbob.db.model import get_metadata - # from edbob.db.mappers import make_mappers from edbob.db.extensions import extend_framework - # global inited, engines, engine, metadata global inited, engines, engine keys = config.get('edbob.db', 'sqlalchemy.keys') @@ -103,12 +95,9 @@ def init(config): if engine: Base.metadata.bind = engine - # metadata = get_metadata(bind=engine) - # make_mappers(metadata) extend_framework() edbob.graft(edbob, edbob.db) - # edbob.graft(edbob, classes) edbob.graft(edbob, model) edbob.graft(edbob, enum) inited = True