Merge branch 'master' of git@veekun.com:floof

[zzz-floof.git] / floof / model / meta.py

diff --git a/floof/model/meta.py b/floof/model/meta.py
index 03d1f92..2992ae7 100644 (file)
--- a/floof/model/meta.py
+++ b/floof/model/meta.py
@@ -1,16 +1,11 @@
 """SQLAlchemy Metadata and Session object"""
 from sqlalchemy import MetaData
-from sqlalchemy.ext.declarative import declarative_base
 from sqlalchemy.orm import scoped_session, sessionmaker
 
-__all__ = ['Session', 'engine', 'TableBase']
+__all__ = ['Session', 'engine', 'metadata']
 
 # SQLAlchemy database engine. Updated by model.init_model()
 engine = None
 
 # SQLAlchemy session manager. Updated by model.init_model()
 Session = scoped_session(sessionmaker())
-
-# Base class for declarative; creates its own metadata object
-TableBase = declarative_base()
-metadata = TableBase.metadata