heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Import "Base" from base instead of models.

Browse Source 
Import the "Base" class for models from db.sql.base instead
of db.sql.models.
This commit is contained in:
Elrond 2012-03-20 12:32:11 +01:00
parent df7c405845
commit 39fd817ab8
5 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mediagoblin/db/sql/convert.py
View File

@ -19,7 +19,8 @@ from copy import copy
from mediagoblin.init import setup_global_and_app_config, setup_database from mediagoblin.init import setup_global_and_app_config, setup_database
from mediagoblin.db.mongo.util import ObjectId from mediagoblin.db.mongo.util import ObjectId
from mediagoblin.db.sql.models import (Base, User, MediaEntry, MediaComment, from mediagoblin.db.sql.base import Base, Session
from mediagoblin.db.sql.models import (User, MediaEntry, MediaComment,
Tag, MediaTag, MediaFile, MediaAttachmentFile, MigrationData) Tag, MediaTag, MediaFile, MediaAttachmentFile, MigrationData)
from mediagoblin.media_types.image.models import ImageData from mediagoblin.media_types.image.models import ImageData
from mediagoblin.media_types.video.models import VideoData from mediagoblin.media_types.video.models import VideoData
@ -27,7 +28,6 @@ from mediagoblin.db.sql.open import setup_connection_and_db_from_config as \
sql_connect sql_connect
from mediagoblin.db.mongo.open import setup_connection_and_db_from_config as \ from mediagoblin.db.mongo.open import setup_connection_and_db_from_config as \
mongo_connect mongo_connect
from mediagoblin.db.sql.base import Session
obj_id_table = dict() obj_id_table = dict()

3
mediagoblin/db/sql/open.py
View File

@ -18,8 +18,7 @@
from sqlalchemy import create_engine from sqlalchemy import create_engine
import logging import logging
from mediagoblin.db.sql.base import Session from mediagoblin.db.sql.base import Base, Session
from mediagoblin.db.sql.models import Base
class DatabaseMaster(object): class DatabaseMaster(object):

2
mediagoblin/media_types/ascii/models.py
View File

@ -15,7 +15,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
from mediagoblin.db.sql.models import Base from mediagoblin.db.sql.base import Base
from sqlalchemy import ( from sqlalchemy import (
Column, Integer, Unicode, UnicodeText, DateTime, Boolean, ForeignKey, Column, Integer, Unicode, UnicodeText, DateTime, Boolean, ForeignKey,

2
mediagoblin/media_types/image/models.py
View File

@ -1,4 +1,4 @@
from mediagoblin.db.sql.models import Base from mediagoblin.db.sql.base import Base
from sqlalchemy import ( from sqlalchemy import (
Column, Integer, Float, ForeignKey) Column, Integer, Float, ForeignKey)

2
mediagoblin/media_types/video/models.py
View File

@ -15,7 +15,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
from mediagoblin.db.sql.models import Base from mediagoblin.db.sql.base import Base
from sqlalchemy import ( from sqlalchemy import (
Column, Integer, SmallInteger, ForeignKey) Column, Integer, SmallInteger, ForeignKey)