Move db.sql.models* to db.models*

mediagoblin/plugins/oauth/migrations.py

@@ -20,7 +20,7 @@ from sqlalchemy import (MetaData, Table, Column,
 from sqlalchemy.ext.declarative import declarative_base
 
 from mediagoblin.db.util import RegisterMigration
-from mediagoblin.db.sql.models import User
+from mediagoblin.db.models import User
 
 
 MIGRATIONS = {}

mediagoblin/plugins/oauth/models.py

@@ -20,7 +20,7 @@ import bcrypt
 from datetime import datetime, timedelta
 
 from mediagoblin.db.sql.base import Base
-from mediagoblin.db.sql.models import User
+from mediagoblin.db.models import User
 
 from sqlalchemy import (
         Column, Unicode, Integer, DateTime, ForeignKey, Enum)