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

diff --git a/docs/source/siteadmin/relnotes.rst b/docs/source/siteadmin/relnotes.rst
index 9b45f642de501e9c366aea5c69f8ab45dd46fd76..7d480d9060320862d226ab2e1f4af34ff1018653 100644 (file)
--- a/docs/source/siteadmin/relnotes.rst
+++ b/docs/source/siteadmin/relnotes.rst
@@ -26,6 +26,9 @@ WIP
 
 **Other changed**
 
+* Plugin writers: Internal restructuring led to mediagoblin.db.sql* be
+  mediagoblin.db.* starting from 0.3.3
+
 * Dependency list has been reduced not requireing the "webob" package anymore.
 
 0.3.2

diff --git a/mediagoblin/admin/views.py b/mediagoblin/admin/views.py
index 073b1e257d7adba3699f9e077cd6f6d2749f9fe2..22ca74a34d94984b6735fc047b4aacb6c88d4f49 100644 (file)
--- a/mediagoblin/admin/views.py
+++ b/mediagoblin/admin/views.py
@@ -16,7 +16,7 @@
 
 from werkzeug.exceptions import Forbidden
 
-from mediagoblin.db.sql.models import MediaEntry
+from mediagoblin.db.models import MediaEntry
 from mediagoblin.decorators import require_active_login
 from mediagoblin.tools.response import render_to_response
 

diff --git a/mediagoblin/auth/views.py b/mediagoblin/auth/views.py
index efd3e018a25243c8a497b9d3a9457e82c75a9a9a..433541354c6056e9f1524970ecb5bba556957a14 100644 (file)
--- a/mediagoblin/auth/views.py
+++ b/mediagoblin/auth/views.py
@@ -18,7 +18,7 @@ import uuid
 import datetime
 
 from mediagoblin import messages, mg_globals
-from mediagoblin.db.sql.models import User
+from mediagoblin.db.models import User
 from mediagoblin.tools.response import render_to_response, redirect, render_404
 from mediagoblin.tools.translate import pass_to_ugettext as _
 from mediagoblin.auth import lib as auth_lib

diff --git a/mediagoblin/db/migrations.py b/mediagoblin/db/migrations.py
index 3f0cb6f00ce4ed72e6716d61bdd2f422a32d1e34..476e2a06c0b30b2d88ec9b1cf5a067f5319f607a 100644 (file)
--- a/mediagoblin/db/migrations.py
+++ b/mediagoblin/db/migrations.py
@@ -24,7 +24,7 @@ from sqlalchemy.ext.declarative import declarative_base
 from migrate.changeset.constraint import UniqueConstraint
 
 from mediagoblin.db.util import RegisterMigration
-from mediagoblin.db.sql.models import MediaEntry, Collection, User
+from mediagoblin.db.models import MediaEntry, Collection, User
 
 MIGRATIONS = {}
 

diff --git a/mediagoblin/db/sql/models.py b/mediagoblin/db/models.py
similarity index 100%
rename from mediagoblin/db/sql/models.py
rename to mediagoblin/db/models.py

diff --git a/mediagoblin/db/sql/models_v0.py b/mediagoblin/db/models_v0.py
similarity index 100%
rename from mediagoblin/db/sql/models_v0.py
rename to mediagoblin/db/models_v0.py

diff --git a/mediagoblin/db/open.py b/mediagoblin/db/open.py
index 801c92eaefebfed940dc603f34c6384386de5269..11b2dc9721e76aa3bb051eb226e1467e27cc4fc5 100644 (file)
--- a/mediagoblin/db/open.py
+++ b/mediagoblin/db/open.py
@@ -50,7 +50,7 @@ class DatabaseMaster(object):
 
 
 def load_models(app_config):
-    import mediagoblin.db.sql.models
+    import mediagoblin.db.models
 
     for media_type in app_config['media_types']:
         _log.debug("Loading %s.models", media_type)

diff --git a/mediagoblin/db/util.py b/mediagoblin/db/util.py
index 2f167e4528f969f949aab146f3351b68392331eb..32dd0884f05f65de85ca271d978abe513716852e 100644 (file)
--- a/mediagoblin/db/util.py
+++ b/mediagoblin/db/util.py
@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 import sys
 from mediagoblin.db.sql.base import Session
-from mediagoblin.db.sql.models import MediaEntry, Tag, MediaTag, Collection
+from mediagoblin.db.models import MediaEntry, Tag, MediaTag, Collection
 
 from mediagoblin.tools.common import simple_printer
 
@@ -45,7 +45,7 @@ class MigrationManager(object):
         self.printer = printer
 
         # For convenience
-        from mediagoblin.db.sql.models import MigrationData
+        from mediagoblin.db.models import MigrationData
 
         self.migration_model = MigrationData
         self.migration_table = MigrationData.__table__
@@ -259,7 +259,7 @@ def assure_migrations_table_setup(db):
     """
     Make sure the migrations table is set up in the database.
     """
-    from mediagoblin.db.sql.models import MigrationData
+    from mediagoblin.db.models import MigrationData
 
     if not MigrationData.__table__.exists(db.bind):
         MigrationData.metadata.create_all(

diff --git a/mediagoblin/decorators.py b/mediagoblin/decorators.py
index f6169060b2cec7b0cbc085a2a81553e2401e1db4..4ae1b86714b8658030b4083ad11e48233112a916 100644 (file)
--- a/mediagoblin/decorators.py
+++ b/mediagoblin/decorators.py
@@ -20,7 +20,7 @@ from urlparse import urljoin
 from werkzeug.exceptions import Forbidden
 from werkzeug.urls import url_quote
 
-from mediagoblin.db.sql.models import MediaEntry, User
+from mediagoblin.db.models import MediaEntry, User
 from mediagoblin.tools.response import redirect, render_404
 
 

diff --git a/mediagoblin/gmg_commands/dbupdate.py b/mediagoblin/gmg_commands/dbupdate.py
index 95898c08918b529196a609d7d79bdac7920621ba..5151ba9d79ec46b179153153f426c18cf55e1a5d 100644 (file)
--- a/mediagoblin/gmg_commands/dbupdate.py
+++ b/mediagoblin/gmg_commands/dbupdate.py
@@ -52,7 +52,7 @@ def gather_database_data(media_types, plugins):
     managed_dbdata = []
 
     # Add main first
-    from mediagoblin.db.sql.models import MODELS as MAIN_MODELS
+    from mediagoblin.db.models import MODELS as MAIN_MODELS
     from mediagoblin.db.migrations import MIGRATIONS as MAIN_MIGRATIONS
 
     managed_dbdata.append(

diff --git a/mediagoblin/listings/views.py b/mediagoblin/listings/views.py
index 801821244a1b57f656d3b39bfba1fb1fd87ef0ee..d37161fc32036082e818e5c5eb4efdbf31204d44 100644 (file)
--- a/mediagoblin/listings/views.py
+++ b/mediagoblin/listings/views.py
@@ -14,7 +14,7 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from mediagoblin.db.sql.models import MediaEntry
+from mediagoblin.db.models import MediaEntry
 from mediagoblin.db.util import media_entries_for_tag_slug
 from mediagoblin.tools.pagination import Pagination
 from mediagoblin.tools.response import render_to_response

diff --git a/mediagoblin/plugins/oauth/migrations.py b/mediagoblin/plugins/oauth/migrations.py
index 3beef0872641ab5d699ad6d897e225ede447b2ed..7b028faff523b4be106837ac96369136424a5233 100644 (file)
--- a/mediagoblin/plugins/oauth/migrations.py
+++ b/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 = {}

diff --git a/mediagoblin/plugins/oauth/models.py b/mediagoblin/plugins/oauth/models.py
index 7e247c1a6f9258cc98bfd133e476cff695d866d0..f52a8ce9b41df6f1dfc377fdd60a82405bd2f6a8 100644 (file)
--- a/mediagoblin/plugins/oauth/models.py
+++ b/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)

diff --git a/mediagoblin/processing/task.py b/mediagoblin/processing/task.py
index b7e761f252386ddb25acf7fbcc589f2b792fe369..b29de9bd89883656558c7384b83983e67f33256c 100644 (file)
--- a/mediagoblin/processing/task.py
+++ b/mediagoblin/processing/task.py
@@ -19,7 +19,7 @@ import logging
 from celery.task import Task
 
 from mediagoblin import mg_globals as mgg
-from mediagoblin.db.sql.models import MediaEntry
+from mediagoblin.db.models import MediaEntry
 from mediagoblin.processing import mark_entry_failed, BaseProcessingFail
 from mediagoblin.tools.processing import json_processing_callback
 

diff --git a/mediagoblin/tests/test_auth.py b/mediagoblin/tests/test_auth.py
index 169b2309e7aa8883a71050724aee8632c1bf4d14..f4a31a81464b61a6910ce01a456a6c0f24801958 100644 (file)
--- a/mediagoblin/tests/test_auth.py
+++ b/mediagoblin/tests/test_auth.py
@@ -21,7 +21,7 @@ from nose.tools import assert_equal
 
 from mediagoblin import mg_globals
 from mediagoblin.auth import lib as auth_lib
-from mediagoblin.db.sql.models import User
+from mediagoblin.db.models import User
 from mediagoblin.tests.tools import setup_fresh_app, fixture_add_user
 from mediagoblin.tools import template, mail
 

diff --git a/mediagoblin/tests/test_tests.py b/mediagoblin/tests/test_tests.py
index 2228d15a97cdd0e31a268c2baa8309c19e220aa3..b11dc730df7c6b108f9a59480e266fe6090a5896 100644 (file)
--- a/mediagoblin/tests/test_tests.py
+++ b/mediagoblin/tests/test_tests.py
@@ -16,7 +16,7 @@
 
 from mediagoblin import mg_globals
 from mediagoblin.tests.tools import get_test_app
-from mediagoblin.db.sql.models import User
+from mediagoblin.db.models import User
 
 
 def test_get_test_app_wipes_db():

diff --git a/mediagoblin/tools/request.py b/mediagoblin/tools/request.py
index f40ab360791c29d6c6c0eb756b08dbc8e86e8f61..f7311facdc21a3212e9fa9d8178b074821aeaa20 100644 (file)
--- a/mediagoblin/tools/request.py
+++ b/mediagoblin/tools/request.py
@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import logging
-from mediagoblin.db.sql.models import User
+from mediagoblin.db.models import User
 
 _log = logging.getLogger(__name__)
 

diff --git a/mediagoblin/user_pages/views.py b/mediagoblin/user_pages/views.py
index 1e5ea3a384e174d314b8c88a8b5de864e6918047..fd9692f5a685d086d6c0f5eaec993096acfb9810 100644 (file)
--- a/mediagoblin/user_pages/views.py
+++ b/mediagoblin/user_pages/views.py
@@ -18,7 +18,7 @@ import logging
 import datetime
 
 from mediagoblin import messages, mg_globals
-from mediagoblin.db.sql.models import (MediaEntry, Collection, CollectionItem,
+from mediagoblin.db.models import (MediaEntry, Collection, CollectionItem,
                                        User)
 from mediagoblin.tools.response import render_to_response, render_404, redirect
 from mediagoblin.tools.translate import pass_to_ugettext as _

diff --git a/mediagoblin/views.py b/mediagoblin/views.py
index 14fbc4e67d5c5d6fbb805a794499ff3b26b02842..6acd7e96f8aa8f56187a34eb7aa109f1a1d10c22 100644 (file)
--- a/mediagoblin/views.py
+++ b/mediagoblin/views.py
@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from mediagoblin import mg_globals
-from mediagoblin.db.sql.models import MediaEntry
+from mediagoblin.db.models import MediaEntry
 from mediagoblin.tools.pagination import Pagination
 from mediagoblin.tools.response import render_to_response
 from mediagoblin.decorators import uses_pagination