This is an automated email from the ASF dual-hosted git repository. dill0wn pushed a commit to branch dw/8495 in repository https://gitbox.apache.org/repos/asf/allura.git
commit a05fca6b8d2e0f0b3a4b3373410694fd06314ff5 Author: Dillon Walls <[email protected]> AuthorDate: Wed Jan 25 15:39:42 2023 +0000 [#8495] fix DeprecationWarning 'ming.orm' -> 'ming.odm' --- Allura/allura/app.py | 2 +- Allura/allura/command/create_neighborhood.py | 2 +- Allura/allura/command/create_trove_categories.py | 2 +- Allura/allura/command/script.py | 2 +- Allura/allura/command/set_neighborhood_features.py | 2 +- Allura/allura/command/show_models.py | 4 ++-- Allura/allura/command/taskd_cleanup.py | 2 +- Allura/allura/config/middleware.py | 2 +- Allura/allura/controllers/repository.py | 2 +- Allura/allura/controllers/rest.py | 2 +- Allura/allura/ext/admin/admin_main.py | 2 +- Allura/allura/ext/personal_dashboard/dashboard_main.py | 2 +- Allura/allura/lib/macro.py | 2 +- Allura/allura/lib/plugin.py | 4 ++-- Allura/allura/lib/project_create_helpers.py | 2 +- Allura/allura/model/__init__.py | 2 +- Allura/allura/model/artifact.py | 6 +++--- Allura/allura/model/attachments.py | 2 +- Allura/allura/model/auth.py | 8 ++++---- Allura/allura/model/discuss.py | 4 ++-- Allura/allura/model/filesystem.py | 4 ++-- Allura/allura/model/monq_model.py | 4 ++-- Allura/allura/model/neighborhood.py | 4 ++-- Allura/allura/model/notification.py | 4 ++-- Allura/allura/model/oauth.py | 4 ++-- Allura/allura/model/project.py | 8 ++++---- Allura/allura/model/repo_refresh.py | 2 +- Allura/allura/model/repository.py | 2 +- Allura/allura/model/session.py | 4 ++-- Allura/allura/model/stats.py | 6 +++--- Allura/allura/scripts/create_sitemap_files.py | 2 +- Allura/allura/scripts/refresh_last_commits.py | 2 +- Allura/allura/scripts/refreshrepo.py | 2 +- Allura/allura/scripts/set_default_user_notifications.py | 2 +- Allura/allura/tasks/repo_tasks.py | 4 ++-- Allura/allura/tests/decorators.py | 2 +- Allura/allura/tests/functional/test_admin.py | 2 +- Allura/allura/tests/functional/test_auth.py | 2 +- Allura/allura/tests/functional/test_home.py | 2 +- Allura/allura/tests/functional/test_neighborhood.py | 2 +- Allura/allura/tests/functional/test_personal_dashboard.py | 2 +- Allura/allura/tests/functional/test_root.py | 2 +- Allura/allura/tests/functional/test_trovecategory.py | 2 +- Allura/allura/tests/model/test_artifact.py | 4 ++-- Allura/allura/tests/model/test_auth.py | 2 +- Allura/allura/tests/model/test_discussion.py | 2 +- Allura/allura/tests/model/test_filesystem.py | 2 +- Allura/allura/tests/model/test_monq.py | 2 +- Allura/allura/tests/model/test_notification.py | 2 +- Allura/allura/tests/model/test_project.py | 2 +- Allura/allura/tests/model/test_repo.py | 2 +- Allura/allura/tests/test_commands.py | 2 +- Allura/allura/tests/test_globals.py | 2 +- Allura/allura/tests/test_helpers.py | 2 +- Allura/allura/tests/test_mail_util.py | 2 +- Allura/allura/tests/test_plugin.py | 2 +- Allura/allura/tests/test_tasks.py | 4 ++-- .../unit/controllers/test_discussion_moderation_controller.py | 2 +- Allura/allura/tests/unit/factories.py | 2 +- Allura/allura/tests/unit/test_ldap_auth_provider.py | 2 +- Allura/allura/websetup/bootstrap.py | 4 ++-- Allura/docs/platform/platform_tour.rst | 2 +- AlluraTest/alluratest/controller.py | 2 +- ForgeActivity/forgeactivity/main.py | 2 +- ForgeBlog/forgeblog/command/rssfeeds.py | 2 +- ForgeBlog/forgeblog/main.py | 2 +- ForgeBlog/forgeblog/model/blog.py | 4 ++-- ForgeBlog/forgeblog/tests/functional/test_feeds.py | 2 +- ForgeBlog/forgeblog/tests/test_app.py | 2 +- ForgeBlog/forgeblog/tests/test_commands.py | 2 +- ForgeBlog/forgeblog/tests/unit/__init__.py | 2 +- ForgeChat/forgechat/command.py | 2 +- ForgeChat/forgechat/model/chat.py | 4 ++-- ForgeDiscussion/forgediscussion/import_support.py | 2 +- ForgeDiscussion/forgediscussion/model/forum.py | 2 +- ForgeDiscussion/forgediscussion/tests/functional/test_rest.py | 2 +- ForgeDiscussion/forgediscussion/tests/test_app.py | 2 +- ForgeFeedback/forgefeedback/feedback_main.py | 2 +- ForgeFeedback/forgefeedback/model/feedback.py | 4 ++-- ForgeFeedback/forgefeedback/tests/unit/__init__.py | 2 +- ForgeFeedback/forgefeedback/tests/unit/test_root_controller.py | 2 +- ForgeFiles/forgefiles/model/files.py | 4 ++-- ForgeFiles/forgefiles/tests/model/__init__.py | 2 +- ForgeGit/forgegit/git_main.py | 2 +- ForgeGit/forgegit/tests/functional/test_controllers.py | 2 +- ForgeGit/forgegit/tests/model/test_repository.py | 2 +- ForgeGit/forgegit/tests/test_git_app.py | 2 +- ForgeGit/forgegit/tests/test_tasks.py | 2 +- ForgeImporters/forgeimporters/forge/discussion.py | 2 +- ForgeImporters/forgeimporters/forge/tracker.py | 2 +- ForgeImporters/forgeimporters/github/tasks.py | 2 +- ForgeImporters/forgeimporters/github/tracker.py | 2 +- ForgeImporters/forgeimporters/github/wiki.py | 2 +- ForgeImporters/forgeimporters/trac/tests/test_tickets.py | 2 +- ForgeImporters/forgeimporters/trac/tickets.py | 2 +- ForgeSVN/forgesvn/model/svn.py | 2 +- ForgeSVN/forgesvn/svn_main.py | 2 +- ForgeSVN/forgesvn/tests/functional/test_controllers.py | 2 +- ForgeSVN/forgesvn/tests/model/test_repository.py | 2 +- ForgeSVN/forgesvn/tests/test_svn_app.py | 2 +- ForgeShortUrl/forgeshorturl/model/shorturl.py | 2 +- ForgeTracker/forgetracker/command/fix_discussion.py | 2 +- ForgeTracker/forgetracker/import_support.py | 2 +- ForgeTracker/forgetracker/model/ticket.py | 8 ++++---- ForgeTracker/forgetracker/tests/command/test_fix_discussion.py | 2 +- ForgeTracker/forgetracker/tests/functional/test_root.py | 2 +- ForgeTracker/forgetracker/tests/test_app.py | 2 +- ForgeTracker/forgetracker/tests/unit/__init__.py | 2 +- ForgeTracker/forgetracker/tests/unit/test_globals_model.py | 2 +- ForgeTracker/forgetracker/tests/unit/test_root_controller.py | 2 +- .../forgetracker/tests/unit/test_ticket_custom_fields_form.py | 2 +- ForgeTracker/forgetracker/tests/unit/test_ticket_form.py | 2 +- ForgeTracker/forgetracker/tests/unit/test_ticket_model.py | 4 ++-- ForgeTracker/forgetracker/tracker_main.py | 2 +- ForgeUserStats/forgeuserstats/main.py | 2 +- ForgeUserStats/forgeuserstats/model/stats.py | 4 ++-- ForgeWiki/forgewiki/model/wiki.py | 4 ++-- ForgeWiki/forgewiki/tests/functional/test_root.py | 2 +- ForgeWiki/forgewiki/tests/test_app.py | 2 +- ForgeWiki/forgewiki/tests/test_models.py | 2 +- ForgeWiki/forgewiki/wiki_main.py | 2 +- scripts/add_user_to_group.py | 2 +- scripts/migrations/013-update-ordinals.py | 4 ++-- scripts/migrations/015-add-neighborhood_id-to-blog-posts.py | 2 +- scripts/migrations/018-add-svn-checkout-url.py | 2 +- scripts/migrations/020-remove-wiki-title-slashes.py | 2 +- scripts/migrations/022-change-anon-display-name.py | 2 +- scripts/migrations/024-migrate-custom-profile-text.py | 2 +- scripts/migrations/026-install-activity-tool.py | 2 +- scripts/migrations/027-change-ticket-write-permissions.py | 2 +- scripts/migrations/028-remove-svn-trees.py | 2 +- scripts/migrations/033-change-comment-anon-permissions.py | 2 +- .../migrations/034-update_subscriptions_ticket_and_mr_titles.py | 2 +- scripts/perf/load-up-forum.py | 2 +- scripts/project-import.py | 2 +- scripts/publicize-neighborhood.py | 2 +- scripts/rethumb.py | 2 +- scripts/scrub-allura-data.py | 2 +- scripts/teamforge-import.py | 2 +- 139 files changed, 173 insertions(+), 173 deletions(-) diff --git a/Allura/allura/app.py b/Allura/allura/app.py index b278720f4..154c6bf32 100644 --- a/Allura/allura/app.py +++ b/Allura/allura/app.py @@ -35,7 +35,7 @@ from formencode import validators as V from webob import exc from formencode import validators as fev -from ming.orm import session +from ming.odm import session from ming.utils import LazyProperty import ew.jinja2_ew as ew diff --git a/Allura/allura/command/create_neighborhood.py b/Allura/allura/command/create_neighborhood.py index 5bad4dc93..936c6daf2 100644 --- a/Allura/allura/command/create_neighborhood.py +++ b/Allura/allura/command/create_neighborhood.py @@ -19,7 +19,7 @@ import logging from . import base -from ming.orm import session +from ming.odm import session from bson import ObjectId from allura import model as M diff --git a/Allura/allura/command/create_trove_categories.py b/Allura/allura/command/create_trove_categories.py index eebdf5381..bdb9815b9 100644 --- a/Allura/allura/command/create_trove_categories.py +++ b/Allura/allura/command/create_trove_categories.py @@ -19,7 +19,7 @@ import re import sys import logging -from ming.orm import session +from ming.odm import session from mock import patch, Mock from . import base diff --git a/Allura/allura/command/script.py b/Allura/allura/command/script.py index 950607555..92384d1b5 100644 --- a/Allura/allura/command/script.py +++ b/Allura/allura/command/script.py @@ -24,7 +24,7 @@ from tg import tmpl_context as c import tg import webob -from ming.orm import session +from ming.odm import session from allura.lib import helpers as h from allura.lib import utils from . import base diff --git a/Allura/allura/command/set_neighborhood_features.py b/Allura/allura/command/set_neighborhood_features.py index 36ba22b06..75bfba032 100644 --- a/Allura/allura/command/set_neighborhood_features.py +++ b/Allura/allura/command/set_neighborhood_features.py @@ -22,7 +22,7 @@ from allura.command import base from bson import ObjectId from allura import model as M from allura.lib import exceptions -from ming.orm import session +from ming.odm import session # Example usage: # paster set-neighborhood-features development.ini diff --git a/Allura/allura/command/show_models.py b/Allura/allura/command/show_models.py index 6357d8e03..4540bf5f5 100644 --- a/Allura/allura/command/show_models.py +++ b/Allura/allura/command/show_models.py @@ -24,8 +24,8 @@ from paste.deploy.converters import asbool from tg import tmpl_context as c, app_globals as g from pymongo.errors import DuplicateKeyError, InvalidDocument, OperationFailure -from ming.orm import mapper, session, Mapper -from ming.orm.declarative import MappedClass +from ming.odm import mapper, session, Mapper +from ming.odm.declarative import MappedClass from allura.tasks.index_tasks import add_artifacts from allura.lib.exceptions import CompoundError diff --git a/Allura/allura/command/taskd_cleanup.py b/Allura/allura/command/taskd_cleanup.py index e9cff5ebf..3c964442e 100644 --- a/Allura/allura/command/taskd_cleanup.py +++ b/Allura/allura/command/taskd_cleanup.py @@ -20,7 +20,7 @@ import time import signal import socket import subprocess -from ming.orm.ormsession import ThreadLocalORMSession +from ming.odm.ormsession import ThreadLocalORMSession import six from allura import model as M diff --git a/Allura/allura/config/middleware.py b/Allura/allura/config/middleware.py index d948706ab..61fdaa09c 100644 --- a/Allura/allura/config/middleware.py +++ b/Allura/allura/config/middleware.py @@ -38,7 +38,7 @@ import activitystream import ew import formencode import ming -from ming.orm.middleware import MingMiddleware +from ming.odm.middleware import MingMiddleware # Must apply patches before other Allura imports to ensure all the patches are effective. # This file gets imported from paste/deploy/loadwsgi.py pretty early in the app execution diff --git a/Allura/allura/controllers/repository.py b/Allura/allura/controllers/repository.py index 96f77d0e9..f4f388c09 100644 --- a/Allura/allura/controllers/repository.py +++ b/Allura/allura/controllers/repository.py @@ -38,7 +38,7 @@ import formencode from formencode import validators from bson import ObjectId from ming.base import Object -from ming.orm import ThreadLocalORMSession, session +from ming.odm import ThreadLocalORMSession, session import allura.tasks from allura import model as M diff --git a/Allura/allura/controllers/rest.py b/Allura/allura/controllers/rest.py index 5121972da..4972a575f 100644 --- a/Allura/allura/controllers/rest.py +++ b/Allura/allura/controllers/rest.py @@ -29,7 +29,7 @@ from tg import expose, flash, redirect, config from tg import tmpl_context as c, app_globals as g from tg import request, response import colander -from ming.orm import session +from ming.odm import session from allura import model as M from allura.controllers.auth import AuthRestController diff --git a/Allura/allura/ext/admin/admin_main.py b/Allura/allura/ext/admin/admin_main.py index 0a9ef9a61..bb3b5e099 100644 --- a/Allura/allura/ext/admin/admin_main.py +++ b/Allura/allura/ext/admin/admin_main.py @@ -33,7 +33,7 @@ from tg import expose, redirect, flash, validate, config, jsonify from tg.decorators import with_trailing_slash, without_trailing_slash from webob import exc from bson import ObjectId -from ming.orm.ormsession import ThreadLocalORMSession +from ming.odm.ormsession import ThreadLocalORMSession from ming.odm import session import PIL diff --git a/Allura/allura/ext/personal_dashboard/dashboard_main.py b/Allura/allura/ext/personal_dashboard/dashboard_main.py index d87aee70b..12cf1fa40 100644 --- a/Allura/allura/ext/personal_dashboard/dashboard_main.py +++ b/Allura/allura/ext/personal_dashboard/dashboard_main.py @@ -20,7 +20,7 @@ import logging from tg import tmpl_context as c, app_globals as g from tg import expose, redirect, config from itertools import islice -from ming.orm import session +from ming.odm import session from allura.model.timeline import perm_check, get_activity_object from allura.controllers import BaseController diff --git a/Allura/allura/lib/macro.py b/Allura/allura/lib/macro.py index f8b8a22f3..669d91eff 100644 --- a/Allura/allura/lib/macro.py +++ b/Allura/allura/lib/macro.py @@ -260,7 +260,7 @@ def get_projects_for_macro( # 2. Choose a random sample of those _ids # 3. Do an ORM query to fetch the objects with those _ids # 4. Shuffle the results - from ming.orm import mapper + from ming.odm import mapper m = mapper(M.Project) collection = M.main_doc_session.db[m.collection.m.collection_name] docs = list(collection.find(q, {'_id': 1})) diff --git a/Allura/allura/lib/plugin.py b/Allura/allura/lib/plugin.py index d9cdf9a0d..39647ddc7 100644 --- a/Allura/allura/lib/plugin.py +++ b/Allura/allura/lib/plugin.py @@ -49,8 +49,8 @@ from paste.deploy.converters import asbool, asint from formencode import validators as fev from ming.utils import LazyProperty -from ming.orm import state -from ming.orm import ThreadLocalORMSession, session, Mapper +from ming.odm import state +from ming.odm import ThreadLocalORMSession, session, Mapper from allura.lib import helpers as h from allura.lib import security diff --git a/Allura/allura/lib/project_create_helpers.py b/Allura/allura/lib/project_create_helpers.py index 1141ae630..34d9dafea 100644 --- a/Allura/allura/lib/project_create_helpers.py +++ b/Allura/allura/lib/project_create_helpers.py @@ -35,7 +35,7 @@ from six.moves.urllib.parse import urlparse from allura.lib.helpers import slugify from allura.model import Neighborhood from ming.base import Object -from ming.orm import ThreadLocalORMSession +from ming.odm import ThreadLocalORMSession from tg import tmpl_context as c, app_globals as g from allura import model as M diff --git a/Allura/allura/model/__init__.py b/Allura/allura/model/__init__.py index ef5adad30..f015776d5 100644 --- a/Allura/allura/model/__init__.py +++ b/Allura/allura/model/__init__.py @@ -46,7 +46,7 @@ from .session import ArtifactSessionExtension from . import repository from . import repo_refresh -from ming.orm import Mapper +from ming.odm import Mapper Mapper.compile_all() __all__ = [ diff --git a/Allura/allura/model/artifact.py b/Allura/allura/model/artifact.py index 2b0a78b74..cf6c94f64 100644 --- a/Allura/allura/model/artifact.py +++ b/Allura/allura/model/artifact.py @@ -24,9 +24,9 @@ import pymongo from tg import tmpl_context as c, app_globals as g from tg import request from ming import schema as S -from ming.orm import state, session -from ming.orm import FieldProperty, ForeignIdProperty, RelationProperty -from ming.orm.declarative import MappedClass +from ming.odm import state, session +from ming.odm import FieldProperty, ForeignIdProperty, RelationProperty +from ming.odm.declarative import MappedClass from ming.utils import LazyProperty import feedgenerator as FG diff --git a/Allura/allura/model/attachments.py b/Allura/allura/model/attachments.py index b5a3b341b..cc91468f6 100644 --- a/Allura/allura/model/attachments.py +++ b/Allura/allura/model/attachments.py @@ -18,7 +18,7 @@ import typing from tg import tmpl_context as c -from ming.orm import FieldProperty +from ming.odm import FieldProperty from ming import schema as S from allura.lib import helpers as h diff --git a/Allura/allura/model/auth.py b/Allura/allura/model/auth.py index b6ab17fec..6047865e1 100644 --- a/Allura/allura/model/auth.py +++ b/Allura/allura/model/auth.py @@ -39,10 +39,10 @@ from tg import tmpl_context as c, app_globals as g from tg import request from ming import schema as S from ming import Field -from ming.orm import session, state -from ming.orm import FieldProperty, RelationProperty, ForeignIdProperty -from ming.orm.declarative import MappedClass -from ming.orm.ormsession import ThreadLocalORMSession +from ming.odm import session, state +from ming.odm import FieldProperty, RelationProperty, ForeignIdProperty +from ming.odm.declarative import MappedClass +from ming.odm.ormsession import ThreadLocalORMSession from ming.utils import LazyProperty import allura.tasks.mail_tasks diff --git a/Allura/allura/model/discuss.py b/Allura/allura/model/discuss.py index 2c40db80f..f208119cc 100644 --- a/Allura/allura/model/discuss.py +++ b/Allura/allura/model/discuss.py @@ -28,8 +28,8 @@ from tg import tmpl_context as c, app_globals as g import tg from ming import schema -from ming.orm.base import session -from ming.orm.property import (FieldProperty, RelationProperty, +from ming.odm.base import session +from ming.odm.property import (FieldProperty, RelationProperty, ForeignIdProperty) from ming.utils import LazyProperty from bson import ObjectId diff --git a/Allura/allura/model/filesystem.py b/Allura/allura/model/filesystem.py index 6f8ab7d1a..6f058d62a 100644 --- a/Allura/allura/model/filesystem.py +++ b/Allura/allura/model/filesystem.py @@ -25,8 +25,8 @@ import PIL from gridfs import GridFS from ming import schema -from ming.orm import session, FieldProperty -from ming.orm.declarative import MappedClass +from ming.odm import session, FieldProperty +from ming.odm.declarative import MappedClass from .session import project_orm_session from allura.lib import utils diff --git a/Allura/allura/model/monq_model.py b/Allura/allura/model/monq_model.py index 911dd6486..770899b16 100644 --- a/Allura/allura/model/monq_model.py +++ b/Allura/allura/model/monq_model.py @@ -30,8 +30,8 @@ from paste.deploy.converters import asbool import ming from ming.utils import LazyProperty from ming import schema as S -from ming.orm import session, FieldProperty -from ming.orm.declarative import MappedClass +from ming.odm import session, FieldProperty +from ming.odm.declarative import MappedClass from allura.lib.helpers import log_output, null_contextmanager from .session import task_orm_session diff --git a/Allura/allura/model/neighborhood.py b/Allura/allura/model/neighborhood.py index 1c39798d6..cad59de72 100644 --- a/Allura/allura/model/neighborhood.py +++ b/Allura/allura/model/neighborhood.py @@ -22,8 +22,8 @@ from collections import OrderedDict import typing from ming import schema as S -from ming.orm import FieldProperty, RelationProperty -from ming.orm.declarative import MappedClass +from ming.odm import FieldProperty, RelationProperty +from ming.odm.declarative import MappedClass from ming.utils import LazyProperty from tg import request diff --git a/Allura/allura/model/notification.py b/Allura/allura/model/notification.py index 69dca7daa..f866d490e 100644 --- a/Allura/allura/model/notification.py +++ b/Allura/allura/model/notification.py @@ -48,8 +48,8 @@ import jinja2 from paste.deploy.converters import asbool, aslist from ming import schema as S -from ming.orm import FieldProperty, ForeignIdProperty, RelationProperty, session -from ming.orm.declarative import MappedClass +from ming.odm import FieldProperty, ForeignIdProperty, RelationProperty, session +from ming.odm.declarative import MappedClass from allura.lib import helpers as h from allura.lib import security diff --git a/Allura/allura/model/oauth.py b/Allura/allura/model/oauth.py index 8060dfce2..ce0baada6 100644 --- a/Allura/allura/model/oauth.py +++ b/Allura/allura/model/oauth.py @@ -25,8 +25,8 @@ from paste.deploy.converters import aslist from tg import config import pymongo from ming import schema as S -from ming.orm import FieldProperty, RelationProperty, ForeignIdProperty, session -from ming.orm.declarative import MappedClass +from ming.odm import FieldProperty, RelationProperty, ForeignIdProperty, session +from ming.odm.declarative import MappedClass from bson import ObjectId from allura.lib import helpers as h diff --git a/Allura/allura/model/project.py b/Allura/allura/model/project.py index 743384775..57ca8260e 100644 --- a/Allura/allura/model/project.py +++ b/Allura/allura/model/project.py @@ -41,10 +41,10 @@ import PIL from ming import schema as S from ming.utils import LazyProperty -from ming.orm import ThreadLocalORMSession -from ming.orm import session, state, MapperExtension -from ming.orm import FieldProperty, RelationProperty, ForeignIdProperty -from ming.orm.declarative import MappedClass +from ming.odm import ThreadLocalORMSession +from ming.odm import session, state, MapperExtension +from ming.odm import FieldProperty, RelationProperty, ForeignIdProperty +from ming.odm.declarative import MappedClass from allura.lib import helpers as h from allura.lib import plugin diff --git a/Allura/allura/model/repo_refresh.py b/Allura/allura/model/repo_refresh.py index f352a17c0..298b536fa 100644 --- a/Allura/allura/model/repo_refresh.py +++ b/Allura/allura/model/repo_refresh.py @@ -24,7 +24,7 @@ import jinja2 from paste.deploy.converters import asint from tg import tmpl_context as c, app_globals as g -from ming.orm import mapper, session, ThreadLocalORMSession +from ming.odm import mapper, session, ThreadLocalORMSession from ming.odm.base import ObjectState, state from allura.lib import utils diff --git a/Allura/allura/model/repository.py b/Allura/allura/model/repository.py index 2eacb1762..90b47e5e4 100644 --- a/Allura/allura/model/repository.py +++ b/Allura/allura/model/repository.py @@ -45,7 +45,7 @@ import bson import six from ming import schema as S -from ming.orm import session +from ming.odm import session from ming import Field, collection, Index from ming.utils import LazyProperty from ming.odm import FieldProperty, session, Mapper, mapper, MappedClass, RelationProperty diff --git a/Allura/allura/model/session.py b/Allura/allura/model/session.py index e3e586394..4ebc283b3 100644 --- a/Allura/allura/model/session.py +++ b/Allura/allura/model/session.py @@ -21,8 +21,8 @@ from collections import defaultdict from ming import Session from ming.odm.base import ObjectState -from ming.orm.base import state -from ming.orm.ormsession import ThreadLocalORMSession, SessionExtension +from ming.odm.base import state +from ming.odm.ormsession import ThreadLocalORMSession, SessionExtension from contextlib import contextmanager from allura.lib.utils import chunked_list diff --git a/Allura/allura/model/stats.py b/Allura/allura/model/stats.py index 2092c898b..92b74b9cd 100644 --- a/Allura/allura/model/stats.py +++ b/Allura/allura/model/stats.py @@ -23,9 +23,9 @@ from tg import config from paste.deploy.converters import asbool from ming import schema as S -from ming.orm import Mapper -from ming.orm import FieldProperty -from ming.orm.declarative import MappedClass +from ming.odm import Mapper +from ming.odm import FieldProperty +from ming.odm.declarative import MappedClass from datetime import timedelta import difflib diff --git a/Allura/allura/scripts/create_sitemap_files.py b/Allura/allura/scripts/create_sitemap_files.py index d501fa01b..1ce1fd9e6 100644 --- a/Allura/allura/scripts/create_sitemap_files.py +++ b/Allura/allura/scripts/create_sitemap_files.py @@ -36,7 +36,7 @@ from jinja2 import Template import tg import webob from tg import tmpl_context as c -from ming.orm import ThreadLocalORMSession +from ming.odm import ThreadLocalORMSession from tg import config from allura import model as M diff --git a/Allura/allura/scripts/refresh_last_commits.py b/Allura/allura/scripts/refresh_last_commits.py index 72495e0d8..47fb8cbaf 100644 --- a/Allura/allura/scripts/refresh_last_commits.py +++ b/Allura/allura/scripts/refresh_last_commits.py @@ -22,7 +22,7 @@ from contextlib import contextmanager import faulthandler from tg import tmpl_context as c -from ming.orm import ThreadLocalORMSession, session +from ming.odm import ThreadLocalORMSession, session from allura import model as M from allura.lib.utils import chunked_find diff --git a/Allura/allura/scripts/refreshrepo.py b/Allura/allura/scripts/refreshrepo.py index 2336a5680..8027f588a 100644 --- a/Allura/allura/scripts/refreshrepo.py +++ b/Allura/allura/scripts/refreshrepo.py @@ -22,7 +22,7 @@ from datetime import datetime from paste.util.converters import asbool from tg import tmpl_context as c -from ming.orm import ThreadLocalORMSession +from ming.odm import ThreadLocalORMSession from allura import model as M from allura.lib.utils import chunked_find, chunked_list diff --git a/Allura/allura/scripts/set_default_user_notifications.py b/Allura/allura/scripts/set_default_user_notifications.py index 91e49540f..1e082779d 100644 --- a/Allura/allura/scripts/set_default_user_notifications.py +++ b/Allura/allura/scripts/set_default_user_notifications.py @@ -18,7 +18,7 @@ import logging import argparse -from ming.orm import session +from ming.odm import session from allura.model import main_orm_session, main_explicitflush_orm_session from allura.scripts import ScriptTask diff --git a/Allura/allura/tasks/repo_tasks.py b/Allura/allura/tasks/repo_tasks.py index 42eb6b914..5a3ae50f1 100644 --- a/Allura/allura/tasks/repo_tasks.py +++ b/Allura/allura/tasks/repo_tasks.py @@ -54,7 +54,7 @@ def clone(cloned_from_path, cloned_from_name, cloned_from_url): @task def reclone(*args, **kwargs): from allura import model as M - from ming.orm import ThreadLocalORMSession + from ming.odm import ThreadLocalORMSession repo = c.app.repo if repo is not None: shutil.rmtree(repo.full_fs_path, ignore_errors=True) @@ -99,7 +99,7 @@ def uninstall(**kwargs): M.MergeRequest.query.remove(dict( app_config_id=c.app.config._id)) super(RepositoryApp, c.app).uninstall(c.project) - from ming.orm import ThreadLocalORMSession + from ming.odm import ThreadLocalORMSession ThreadLocalORMSession.flush_all() diff --git a/Allura/allura/tests/decorators.py b/Allura/allura/tests/decorators.py index 53aa5dff2..a342e58cb 100644 --- a/Allura/allura/tests/decorators.py +++ b/Allura/allura/tests/decorators.py @@ -21,7 +21,7 @@ from functools import wraps import contextlib from six.moves.urllib.parse import parse_qs -from ming.orm.ormsession import ThreadLocalORMSession +from ming.odm.ormsession import ThreadLocalORMSession from tg import tmpl_context as c from mock import patch import tg diff --git a/Allura/allura/tests/functional/test_admin.py b/Allura/allura/tests/functional/test_admin.py index e5683ebc8..ea44f5948 100644 --- a/Allura/allura/tests/functional/test_admin.py +++ b/Allura/allura/tests/functional/test_admin.py @@ -23,7 +23,7 @@ import logging import tg import PIL -from ming.orm.ormsession import ThreadLocalORMSession +from ming.odm.ormsession import ThreadLocalORMSession from tg import expose from tg import tmpl_context as c, app_globals as g import mock diff --git a/Allura/allura/tests/functional/test_auth.py b/Allura/allura/tests/functional/test_auth.py index 941215623..d11c08d3d 100644 --- a/Allura/allura/tests/functional/test_auth.py +++ b/Allura/allura/tests/functional/test_auth.py @@ -28,7 +28,7 @@ from six.moves.urllib.parse import urlencode from bson import ObjectId import re -from ming.orm.ormsession import ThreadLocalORMSession, session +from ming.odm.ormsession import ThreadLocalORMSession, session from tg import config, expose from mock import patch, Mock import mock diff --git a/Allura/allura/tests/functional/test_home.py b/Allura/allura/tests/functional/test_home.py index 0479fc1fb..b49826618 100644 --- a/Allura/allura/tests/functional/test_home.py +++ b/Allura/allura/tests/functional/test_home.py @@ -20,7 +20,7 @@ import re import os from tg import tmpl_context as c -from ming.orm import ThreadLocalORMSession +from ming.odm import ThreadLocalORMSession import allura from allura.tests import TestController diff --git a/Allura/allura/tests/functional/test_neighborhood.py b/Allura/allura/tests/functional/test_neighborhood.py index 482c097f0..2ce7641e1 100644 --- a/Allura/allura/tests/functional/test_neighborhood.py +++ b/Allura/allura/tests/functional/test_neighborhood.py @@ -25,7 +25,7 @@ import six.moves.urllib.error import PIL from mock import patch from tg import config -from ming.orm.ormsession import ThreadLocalORMSession, session +from ming.odm.ormsession import ThreadLocalORMSession, session from paste.httpexceptions import HTTPFound, HTTPMovedPermanently from tg import app_globals as g, tmpl_context as c diff --git a/Allura/allura/tests/functional/test_personal_dashboard.py b/Allura/allura/tests/functional/test_personal_dashboard.py index 8cdae92ab..154480099 100644 --- a/Allura/allura/tests/functional/test_personal_dashboard.py +++ b/Allura/allura/tests/functional/test_personal_dashboard.py @@ -19,7 +19,7 @@ import pkg_resources import mock import tg -from ming.orm import ThreadLocalORMSession, ThreadLocalODMSession +from ming.odm import ThreadLocalORMSession, ThreadLocalODMSession from tg import tmpl_context as c from allura import model as M diff --git a/Allura/allura/tests/functional/test_root.py b/Allura/allura/tests/functional/test_root.py index dc5dace07..1a289e913 100644 --- a/Allura/allura/tests/functional/test_root.py +++ b/Allura/allura/tests/functional/test_root.py @@ -31,7 +31,7 @@ from unittest import skipIf from tg import tmpl_context as c from alluratest.tools import module_not_available -from ming.orm.ormsession import ThreadLocalORMSession +from ming.odm.ormsession import ThreadLocalORMSession import mock import tg diff --git a/Allura/allura/tests/functional/test_trovecategory.py b/Allura/allura/tests/functional/test_trovecategory.py index 5067d586d..e1a71052d 100644 --- a/Allura/allura/tests/functional/test_trovecategory.py +++ b/Allura/allura/tests/functional/test_trovecategory.py @@ -18,7 +18,7 @@ from bs4 import BeautifulSoup import mock from tg import config -from ming.orm import session +from ming.odm import session from allura import model as M from allura.lib import helpers as h diff --git a/Allura/allura/tests/model/test_artifact.py b/Allura/allura/tests/model/test_artifact.py index 35402dd0c..68349a47f 100644 --- a/Allura/allura/tests/model/test_artifact.py +++ b/Allura/allura/tests/model/test_artifact.py @@ -24,8 +24,8 @@ from datetime import datetime from tg import tmpl_context as c from mock import patch import pytest -from ming.orm.ormsession import ThreadLocalORMSession -from ming.orm import Mapper +from ming.odm.ormsession import ThreadLocalORMSession +from ming.odm import Mapper from bson import ObjectId from webob import Request diff --git a/Allura/allura/tests/model/test_auth.py b/Allura/allura/tests/model/test_auth.py index 2e77f7486..c8c1e99f9 100644 --- a/Allura/allura/tests/model/test_auth.py +++ b/Allura/allura/tests/model/test_auth.py @@ -26,7 +26,7 @@ from tg import tmpl_context as c, app_globals as g, request as r from webob import Request from mock import patch, Mock -from ming.orm.ormsession import ThreadLocalORMSession +from ming.odm.ormsession import ThreadLocalORMSession from ming.odm import session from allura import model as M diff --git a/Allura/allura/tests/model/test_discussion.py b/Allura/allura/tests/model/test_discussion.py index 3c158cd3f..3afd4163b 100644 --- a/Allura/allura/tests/model/test_discussion.py +++ b/Allura/allura/tests/model/test_discussion.py @@ -27,7 +27,7 @@ from tg import tmpl_context as c import mock from mock import patch -from ming.orm import session, ThreadLocalORMSession +from ming.odm import session, ThreadLocalORMSession from webob import exc from allura import model as M diff --git a/Allura/allura/tests/model/test_filesystem.py b/Allura/allura/tests/model/test_filesystem.py index 70ccdedb4..58365a65d 100644 --- a/Allura/allura/tests/model/test_filesystem.py +++ b/Allura/allura/tests/model/test_filesystem.py @@ -21,7 +21,7 @@ from io import BytesIO import ming from tg import tmpl_context as c -from ming.orm import session, Mapper +from ming.odm import session, Mapper from mock import patch from webob import Request, Response diff --git a/Allura/allura/tests/model/test_monq.py b/Allura/allura/tests/model/test_monq.py index 9b2d51754..8b0a4e216 100644 --- a/Allura/allura/tests/model/test_monq.py +++ b/Allura/allura/tests/model/test_monq.py @@ -17,7 +17,7 @@ import pprint -from ming.orm import ThreadLocalORMSession +from ming.odm import ThreadLocalORMSession from alluratest.controller import setup_basic_test, setup_global_objects from allura import model as M diff --git a/Allura/allura/tests/model/test_notification.py b/Allura/allura/tests/model/test_notification.py index 3a2ba9cf8..4f21e25d1 100644 --- a/Allura/allura/tests/model/test_notification.py +++ b/Allura/allura/tests/model/test_notification.py @@ -20,7 +20,7 @@ from datetime import timedelta import collections from tg import tmpl_context as c, app_globals as g -from ming.orm import ThreadLocalORMSession +from ming.odm import ThreadLocalORMSession import mock import bson diff --git a/Allura/allura/tests/model/test_project.py b/Allura/allura/tests/model/test_project.py index 48297a6e8..84e095c6e 100644 --- a/Allura/allura/tests/model/test_project.py +++ b/Allura/allura/tests/model/test_project.py @@ -19,7 +19,7 @@ Model tests for project """ from tg import tmpl_context as c -from ming.orm.ormsession import ThreadLocalORMSession +from ming.odm.ormsession import ThreadLocalORMSession from formencode import validators as fev from allura import model as M diff --git a/Allura/allura/tests/model/test_repo.py b/Allura/allura/tests/model/test_repo.py index b1fab59d6..f45d0b1bf 100644 --- a/Allura/allura/tests/model/test_repo.py +++ b/Allura/allura/tests/model/test_repo.py @@ -22,7 +22,7 @@ import unittest import mock from tg import tmpl_context as c from bson import ObjectId -from ming.orm import session +from ming.odm import session from tg import config from alluratest.controller import setup_basic_test, setup_global_objects diff --git a/Allura/allura/tests/test_commands.py b/Allura/allura/tests/test_commands.py index db9ae0296..66b3283ca 100644 --- a/Allura/allura/tests/test_commands.py +++ b/Allura/allura/tests/test_commands.py @@ -21,7 +21,7 @@ import datetime from testfixtures import OutputCapture from ming.base import Object -from ming.orm import ThreadLocalORMSession +from ming.odm import ThreadLocalORMSession from mock import Mock, call, patch import pytest import pymongo diff --git a/Allura/allura/tests/test_globals.py b/Allura/allura/tests/test_globals.py index b0e4d56af..42bc94c08 100644 --- a/Allura/allura/tests/test_globals.py +++ b/Allura/allura/tests/test_globals.py @@ -29,7 +29,7 @@ from tg import tmpl_context as c, app_globals as g import tg from oembed import OEmbedError -from ming.orm import ThreadLocalORMSession +from ming.odm import ThreadLocalORMSession from alluratest.controller import ( setup_basic_test, setup_global_objects, diff --git a/Allura/allura/tests/test_helpers.py b/Allura/allura/tests/test_helpers.py index c686a9e32..4498b1c1d 100644 --- a/Allura/allura/tests/test_helpers.py +++ b/Allura/allura/tests/test_helpers.py @@ -27,7 +27,7 @@ from tg import tmpl_context as c from alluratest.tools import module_not_available from webob import Request from webob.exc import HTTPUnauthorized -from ming.orm import ThreadLocalORMSession +from ming.odm import ThreadLocalORMSession from markupsafe import Markup import pytest diff --git a/Allura/allura/tests/test_mail_util.py b/Allura/allura/tests/test_mail_util.py index 872117cf5..838d96b99 100644 --- a/Allura/allura/tests/test_mail_util.py +++ b/Allura/allura/tests/test_mail_util.py @@ -21,7 +21,7 @@ from six.moves.email_mime_text import MIMEText import mock import pytest -from ming.orm import ThreadLocalORMSession +from ming.odm import ThreadLocalORMSession from tg import config as tg_config from alluratest.controller import setup_basic_test, setup_global_objects diff --git a/Allura/allura/tests/test_plugin.py b/Allura/allura/tests/test_plugin.py index e440a60d8..9c5fee493 100644 --- a/Allura/allura/tests/test_plugin.py +++ b/Allura/allura/tests/test_plugin.py @@ -22,7 +22,7 @@ import tg from tg import tmpl_context as c from webob import Request, exc from bson import ObjectId -from ming.orm.ormsession import ThreadLocalORMSession +from ming.odm.ormsession import ThreadLocalORMSession from mock import Mock, MagicMock, patch import pytest diff --git a/Allura/allura/tests/test_tasks.py b/Allura/allura/tests/test_tasks.py index 275c36455..1399c2339 100644 --- a/Allura/allura/tests/test_tasks.py +++ b/Allura/allura/tests/test_tasks.py @@ -29,8 +29,8 @@ import tg import mock from tg import tmpl_context as c, app_globals as g -from ming.orm import FieldProperty, Mapper -from ming.orm import ThreadLocalORMSession +from ming.odm import FieldProperty, Mapper +from ming.odm import ThreadLocalORMSession from testfixtures import LogCapture from alluratest.controller import setup_basic_test, setup_global_objects, TestController diff --git a/Allura/allura/tests/unit/controllers/test_discussion_moderation_controller.py b/Allura/allura/tests/unit/controllers/test_discussion_moderation_controller.py index 4f7f61d78..6ab889d4f 100644 --- a/Allura/allura/tests/unit/controllers/test_discussion_moderation_controller.py +++ b/Allura/allura/tests/unit/controllers/test_discussion_moderation_controller.py @@ -16,7 +16,7 @@ # under the License. from mock import Mock, patch -from ming.orm import ThreadLocalORMSession, session +from ming.odm import ThreadLocalORMSession, session from allura.tests.unit import WithDatabase from allura.tests.unit.factories import create_post, create_discussion diff --git a/Allura/allura/tests/unit/factories.py b/Allura/allura/tests/unit/factories.py index bc1da5415..d07b30004 100644 --- a/Allura/allura/tests/unit/factories.py +++ b/Allura/allura/tests/unit/factories.py @@ -17,7 +17,7 @@ from functools import wraps -from ming.orm import ThreadLocalORMSession +from ming.odm import ThreadLocalORMSession from allura.model.project import Project, Neighborhood, AppConfig from allura.model.auth import User diff --git a/Allura/allura/tests/unit/test_ldap_auth_provider.py b/Allura/allura/tests/unit/test_ldap_auth_provider.py index 1b0967dfc..c2ff7b3ec 100644 --- a/Allura/allura/tests/unit/test_ldap_auth_provider.py +++ b/Allura/allura/tests/unit/test_ldap_auth_provider.py @@ -23,7 +23,7 @@ from bson import ObjectId from mock import patch, Mock from unittest import SkipTest from webob import Request -from ming.orm.ormsession import ThreadLocalORMSession +from ming.odm.ormsession import ThreadLocalORMSession from tg import config from alluratest.controller import setup_basic_test diff --git a/Allura/allura/websetup/bootstrap.py b/Allura/allura/websetup/bootstrap.py index f6e5c93f9..0cbfd1ace 100644 --- a/Allura/allura/websetup/bootstrap.py +++ b/Allura/allura/websetup/bootstrap.py @@ -29,8 +29,8 @@ import ew from allura.model.oauth import dummy_oauths from ming import Session, mim -from ming.orm import state, session -from ming.orm.ormsession import ThreadLocalORMSession +from ming.odm import state, session +from ming.odm.ormsession import ThreadLocalORMSession import allura from allura.lib import plugin diff --git a/Allura/docs/platform/platform_tour.rst b/Allura/docs/platform/platform_tour.rst index af7236de5..de18a7f78 100644 --- a/Allura/docs/platform/platform_tour.rst +++ b/Allura/docs/platform/platform_tour.rst @@ -113,7 +113,7 @@ Some examples of artifacts in the current tools: In order to implement your own artifact, you should override at least a few of the methods of the `allura.model.artifact.Artifact` class:: - from ming.orm.property import FieldProperty + from ming.odm.property import FieldProperty from allura.model import Artifact class NewArtifact(Artifact): diff --git a/AlluraTest/alluratest/controller.py b/AlluraTest/alluratest/controller.py index 885bfbff9..1928fa5c4 100644 --- a/AlluraTest/alluratest/controller.py +++ b/AlluraTest/alluratest/controller.py @@ -36,7 +36,7 @@ import tg from tg.wsgiapp import RequestLocals from webob import Response, Request import ew -from ming.orm import ThreadLocalORMSession +from ming.odm import ThreadLocalORMSession import ming.orm import pkg_resources import requests diff --git a/ForgeActivity/forgeactivity/main.py b/ForgeActivity/forgeactivity/main.py index 30a2bdd41..ec2ca318c 100644 --- a/ForgeActivity/forgeactivity/main.py +++ b/ForgeActivity/forgeactivity/main.py @@ -21,7 +21,7 @@ from datetime import timedelta from itertools import islice from bson import ObjectId -from ming.orm import session +from ming.odm import session from tg import tmpl_context as c, app_globals as g from tg import request, response from tg import expose, validate, config diff --git a/ForgeBlog/forgeblog/command/rssfeeds.py b/ForgeBlog/forgeblog/command/rssfeeds.py index 966b2d1c5..96c410b39 100644 --- a/ForgeBlog/forgeblog/command/rssfeeds.py +++ b/ForgeBlog/forgeblog/command/rssfeeds.py @@ -24,7 +24,7 @@ from bson import ObjectId from . import base from allura.command import base as allura_base -from ming.orm import session +from ming.odm import session from tg import tmpl_context as c from allura import model as M diff --git a/ForgeBlog/forgeblog/main.py b/ForgeBlog/forgeblog/main.py index cfa079289..43e43f2c7 100644 --- a/ForgeBlog/forgeblog/main.py +++ b/ForgeBlog/forgeblog/main.py @@ -33,7 +33,7 @@ import formencode from formencode import validators from webob import exc -from ming.orm import session +from ming.odm import session # Allura-specific imports from allura.app import Application, SitemapEntry, ConfigOption diff --git a/ForgeBlog/forgeblog/model/blog.py b/ForgeBlog/forgeblog/model/blog.py index 795300958..c152b7862 100644 --- a/ForgeBlog/forgeblog/model/blog.py +++ b/ForgeBlog/forgeblog/model/blog.py @@ -27,8 +27,8 @@ from tg import config as tg_config from pymongo.errors import DuplicateKeyError from ming import schema -from ming.orm import FieldProperty, ForeignIdProperty, Mapper, session, state -from ming.orm.declarative import MappedClass +from ming.odm import FieldProperty, ForeignIdProperty, Mapper, session, state +from ming.odm.declarative import MappedClass from allura import model as M from allura.model.timeline import ActivityObject diff --git a/ForgeBlog/forgeblog/tests/functional/test_feeds.py b/ForgeBlog/forgeblog/tests/functional/test_feeds.py index dd68b0ea8..a565ef18c 100644 --- a/ForgeBlog/forgeblog/tests/functional/test_feeds.py +++ b/ForgeBlog/forgeblog/tests/functional/test_feeds.py @@ -18,7 +18,7 @@ import datetime -from ming.orm.ormsession import ThreadLocalORMSession +from ming.odm.ormsession import ThreadLocalORMSession from tg import tmpl_context as c from alluratest.controller import TestController diff --git a/ForgeBlog/forgeblog/tests/test_app.py b/ForgeBlog/forgeblog/tests/test_app.py index 86ecba4e5..4b8afc0a4 100644 --- a/ForgeBlog/forgeblog/tests/test_app.py +++ b/ForgeBlog/forgeblog/tests/test_app.py @@ -22,7 +22,7 @@ from cgi import FieldStorage from io import BytesIO from tg import tmpl_context as c -from ming.orm import ThreadLocalORMSession +from ming.odm import ThreadLocalORMSession from allura import model as M from allura.lib import helpers as h diff --git a/ForgeBlog/forgeblog/tests/test_commands.py b/ForgeBlog/forgeblog/tests/test_commands.py index 1728dbf3e..db3743351 100644 --- a/ForgeBlog/forgeblog/tests/test_commands.py +++ b/ForgeBlog/forgeblog/tests/test_commands.py @@ -21,7 +21,7 @@ import pkg_resources import mock import feedparser -from ming.orm.ormsession import ThreadLocalORMSession +from ming.odm.ormsession import ThreadLocalORMSession from alluratest.controller import setup_basic_test, setup_global_objects from alluratest.tools import module_not_available diff --git a/ForgeBlog/forgeblog/tests/unit/__init__.py b/ForgeBlog/forgeblog/tests/unit/__init__.py index 59d93c01e..6e84aa786 100644 --- a/ForgeBlog/forgeblog/tests/unit/__init__.py +++ b/ForgeBlog/forgeblog/tests/unit/__init__.py @@ -16,7 +16,7 @@ # under the License. from tg import tmpl_context as c -from ming.orm.ormsession import ThreadLocalORMSession +from ming.odm.ormsession import ThreadLocalORMSession from allura.websetup import bootstrap from allura.lib import helpers as h diff --git a/ForgeChat/forgechat/command.py b/ForgeChat/forgechat/command.py index 8bd51e1cf..738603d84 100644 --- a/ForgeChat/forgechat/command.py +++ b/ForgeChat/forgechat/command.py @@ -30,7 +30,7 @@ import tg from paste.script import command from paste.deploy.converters import asint -from ming.orm import ThreadLocalORMSession +from ming.odm import ThreadLocalORMSession import allura from allura.command import base diff --git a/ForgeChat/forgechat/model/chat.py b/ForgeChat/forgechat/model/chat.py index d55287c41..03d1c0905 100644 --- a/ForgeChat/forgechat/model/chat.py +++ b/ForgeChat/forgechat/model/chat.py @@ -19,8 +19,8 @@ from datetime import datetime import typing from ming import schema as S -from ming.orm import FieldProperty, Mapper -from ming.orm.declarative import MappedClass +from ming.odm import FieldProperty, Mapper +from ming.odm.declarative import MappedClass from allura import model as M from allura.model.types import MarkdownCache diff --git a/ForgeDiscussion/forgediscussion/import_support.py b/ForgeDiscussion/forgediscussion/import_support.py index fcc61d91a..d62ac528c 100644 --- a/ForgeDiscussion/forgediscussion/import_support.py +++ b/ForgeDiscussion/forgediscussion/import_support.py @@ -19,7 +19,7 @@ import logging from datetime import datetime from ming import schema as S -from ming.orm import ThreadLocalORMSession, session +from ming.odm import ThreadLocalORMSession, session from tg import tmpl_context as c diff --git a/ForgeDiscussion/forgediscussion/model/forum.py b/ForgeDiscussion/forgediscussion/model/forum.py index d9fb58381..06c0e16cb 100644 --- a/ForgeDiscussion/forgediscussion/model/forum.py +++ b/ForgeDiscussion/forgediscussion/model/forum.py @@ -24,7 +24,7 @@ import pymongo from tg import tmpl_context as c from ming import schema from ming.utils import LazyProperty -from ming.orm import FieldProperty, RelationProperty, ForeignIdProperty, Mapper +from ming.odm import FieldProperty, RelationProperty, ForeignIdProperty, Mapper from tg import config as tg_config diff --git a/ForgeDiscussion/forgediscussion/tests/functional/test_rest.py b/ForgeDiscussion/forgediscussion/tests/functional/test_rest.py index 5e6508728..119d2ea49 100644 --- a/ForgeDiscussion/forgediscussion/tests/functional/test_rest.py +++ b/ForgeDiscussion/forgediscussion/tests/functional/test_rest.py @@ -20,7 +20,7 @@ from allura.tests import decorators as td from allura import model as M from alluratest.controller import TestRestApiBase from forgediscussion.model import ForumThread -from ming.orm import ThreadLocalORMSession +from ming.odm import ThreadLocalORMSession class TestDiscussionApiBase(TestRestApiBase): diff --git a/ForgeDiscussion/forgediscussion/tests/test_app.py b/ForgeDiscussion/forgediscussion/tests/test_app.py index 434e4d2a8..63cc3aa00 100644 --- a/ForgeDiscussion/forgediscussion/tests/test_app.py +++ b/ForgeDiscussion/forgediscussion/tests/test_app.py @@ -26,7 +26,7 @@ from alluratest.controller import setup_basic_test, setup_unit_test from tg import tmpl_context as c from forgediscussion.site_stats import posts_24hr -from ming.orm import ThreadLocalORMSession +from ming.odm import ThreadLocalORMSession from allura import model as M from allura.tests import decorators as td diff --git a/ForgeFeedback/forgefeedback/feedback_main.py b/ForgeFeedback/forgefeedback/feedback_main.py index 64c792eb4..581fa61f7 100644 --- a/ForgeFeedback/forgefeedback/feedback_main.py +++ b/ForgeFeedback/forgefeedback/feedback_main.py @@ -24,7 +24,7 @@ from tg import expose, flash, url, config, request, redirect from tg.decorators import with_trailing_slash, without_trailing_slash from tg import tmpl_context as c, app_globals as g from ming.odm import session -from ming.orm import session +from ming.odm import session # profanityfilter package from profanityfilter import ProfanityFilter diff --git a/ForgeFeedback/forgefeedback/model/feedback.py b/ForgeFeedback/forgefeedback/model/feedback.py index 7af33c661..bb01cdee4 100644 --- a/ForgeFeedback/forgefeedback/model/feedback.py +++ b/ForgeFeedback/forgefeedback/model/feedback.py @@ -25,8 +25,8 @@ from datetime import datetime from bson import ObjectId from tg import tmpl_context as c from ming import schema -from ming.orm import Mapper -from ming.orm import FieldProperty, ForeignIdProperty, RelationProperty +from ming.odm import Mapper +from ming.odm import FieldProperty, ForeignIdProperty, RelationProperty # Pyforge-specific imports diff --git a/ForgeFeedback/forgefeedback/tests/unit/__init__.py b/ForgeFeedback/forgefeedback/tests/unit/__init__.py index 757dcf782..e27db905e 100644 --- a/ForgeFeedback/forgefeedback/tests/unit/__init__.py +++ b/ForgeFeedback/forgefeedback/tests/unit/__init__.py @@ -16,7 +16,7 @@ # under the License. from tg import tmpl_context as c -from ming.orm.ormsession import ThreadLocalORMSession +from ming.odm.ormsession import ThreadLocalORMSession from allura.websetup import bootstrap from allura.lib import helpers as h diff --git a/ForgeFeedback/forgefeedback/tests/unit/test_root_controller.py b/ForgeFeedback/forgefeedback/tests/unit/test_root_controller.py index bd86be46f..9add55d9d 100644 --- a/ForgeFeedback/forgefeedback/tests/unit/test_root_controller.py +++ b/ForgeFeedback/forgefeedback/tests/unit/test_root_controller.py @@ -15,7 +15,7 @@ # specific language governing permissions and limitations # under the License. -from ming.orm.ormsession import session +from ming.odm.ormsession import session from tg import tmpl_context as c from allura.lib import helpers as h diff --git a/ForgeFiles/forgefiles/model/files.py b/ForgeFiles/forgefiles/model/files.py index 457e2c45b..e2de35082 100755 --- a/ForgeFiles/forgefiles/model/files.py +++ b/ForgeFiles/forgefiles/model/files.py @@ -25,8 +25,8 @@ import re import typing from ming import schema as S -from ming.orm import Mapper -from ming.orm import FieldProperty, ForeignIdProperty, RelationProperty +from ming.odm import Mapper +from ming.odm import FieldProperty, ForeignIdProperty, RelationProperty from bson import ObjectId from tg import tmpl_context as c diff --git a/ForgeFiles/forgefiles/tests/model/__init__.py b/ForgeFiles/forgefiles/tests/model/__init__.py index 2b562f8dd..c1e8ee889 100644 --- a/ForgeFiles/forgefiles/tests/model/__init__.py +++ b/ForgeFiles/forgefiles/tests/model/__init__.py @@ -16,7 +16,7 @@ # under the License. from tg import tmpl_context as c -from ming.orm.ormsession import ThreadLocalORMSession +from ming.odm.ormsession import ThreadLocalORMSession from allura.websetup import bootstrap from allura.lib import helpers as h diff --git a/ForgeGit/forgegit/git_main.py b/ForgeGit/forgegit/git_main.py index f7850d72f..d6586dbdf 100644 --- a/ForgeGit/forgegit/git_main.py +++ b/ForgeGit/forgegit/git_main.py @@ -21,7 +21,7 @@ import logging from tg import tmpl_context as c from ming.utils import LazyProperty -from ming.orm.ormsession import ThreadLocalORMSession +from ming.odm.ormsession import ThreadLocalORMSession from timermiddleware import Timer import git diff --git a/ForgeGit/forgegit/tests/functional/test_controllers.py b/ForgeGit/forgegit/tests/functional/test_controllers.py index d42d91239..d900737be 100644 --- a/ForgeGit/forgegit/tests/functional/test_controllers.py +++ b/ForgeGit/forgegit/tests/functional/test_controllers.py @@ -26,7 +26,7 @@ import pkg_resources from alluratest.tools import assert_regexp_matches from tg import tmpl_context as c import tg -from ming.orm import ThreadLocalORMSession +from ming.odm import ThreadLocalORMSession from mock import patch, PropertyMock from alluratest.controller import setup_global_objects diff --git a/ForgeGit/forgegit/tests/model/test_repository.py b/ForgeGit/forgegit/tests/model/test_repository.py index 29efceea1..deb403c24 100644 --- a/ForgeGit/forgegit/tests/model/test_repository.py +++ b/ForgeGit/forgegit/tests/model/test_repository.py @@ -28,7 +28,7 @@ import mock from tg import tmpl_context as c, app_globals as g import tg from ming.base import Object -from ming.orm import ThreadLocalORMSession, session +from ming.odm import ThreadLocalORMSession, session from testfixtures import TempDirectory from alluratest.controller import setup_basic_test, setup_global_objects diff --git a/ForgeGit/forgegit/tests/test_git_app.py b/ForgeGit/forgegit/tests/test_git_app.py index 59c86012b..4d544c7dd 100644 --- a/ForgeGit/forgegit/tests/test_git_app.py +++ b/ForgeGit/forgegit/tests/test_git_app.py @@ -18,7 +18,7 @@ import unittest from tg import tmpl_context as c -from ming.orm import ThreadLocalORMSession +from ming.odm import ThreadLocalORMSession from alluratest.controller import setup_basic_test, setup_global_objects from allura.lib import helpers as h diff --git a/ForgeGit/forgegit/tests/test_tasks.py b/ForgeGit/forgegit/tests/test_tasks.py index 26e22c644..fbd87ebf3 100644 --- a/ForgeGit/forgegit/tests/test_tasks.py +++ b/ForgeGit/forgegit/tests/test_tasks.py @@ -18,7 +18,7 @@ import unittest import mock from testfixtures import LogCapture -from ming.orm import ThreadLocalORMSession +from ming.odm import ThreadLocalORMSession from tg import tmpl_context as c from alluratest.controller import setup_basic_test, setup_global_objects diff --git a/ForgeImporters/forgeimporters/forge/discussion.py b/ForgeImporters/forgeimporters/forge/discussion.py index 890d2359e..7881b7800 100644 --- a/ForgeImporters/forgeimporters/forge/discussion.py +++ b/ForgeImporters/forgeimporters/forge/discussion.py @@ -20,7 +20,7 @@ from dateutil.parser import parse from tg import tmpl_context as c from tg import app_globals as g -from ming.orm import session, ThreadLocalORMSession +from ming.odm import session, ThreadLocalORMSession from tg import ( expose, diff --git a/ForgeImporters/forgeimporters/forge/tracker.py b/ForgeImporters/forgeimporters/forge/tracker.py index 12be01095..42ce15ad2 100644 --- a/ForgeImporters/forgeimporters/forge/tracker.py +++ b/ForgeImporters/forgeimporters/forge/tracker.py @@ -20,7 +20,7 @@ import json import dateutil.parser from tg import tmpl_context as c from tg import app_globals as g -from ming.orm import session, ThreadLocalORMSession +from ming.odm import session, ThreadLocalORMSession from tg import ( expose, diff --git a/ForgeImporters/forgeimporters/github/tasks.py b/ForgeImporters/forgeimporters/github/tasks.py index db12c4d3d..00653645f 100644 --- a/ForgeImporters/forgeimporters/github/tasks.py +++ b/ForgeImporters/forgeimporters/github/tasks.py @@ -18,7 +18,7 @@ from tg import tmpl_context as c from tg import app_globals as g -from ming.orm import ThreadLocalORMSession +from ming.odm import ThreadLocalORMSession from allura.lib.decorators import task diff --git a/ForgeImporters/forgeimporters/github/tracker.py b/ForgeImporters/forgeimporters/github/tracker.py index 0946f38f5..4fa7d507d 100644 --- a/ForgeImporters/forgeimporters/github/tracker.py +++ b/ForgeImporters/forgeimporters/github/tracker.py @@ -37,7 +37,7 @@ from allura.lib import helpers as h from allura.lib import validators as v from allura.lib.plugin import ImportIdConverter from allura.lib.decorators import require_post -from ming.orm import session, ThreadLocalORMSession +from ming.odm import session, ThreadLocalORMSession from tg import tmpl_context as c from tg import app_globals as g diff --git a/ForgeImporters/forgeimporters/github/wiki.py b/ForgeImporters/forgeimporters/github/wiki.py index a062c3898..da8522610 100644 --- a/ForgeImporters/forgeimporters/github/wiki.py +++ b/ForgeImporters/forgeimporters/github/wiki.py @@ -27,7 +27,7 @@ from bs4 import BeautifulSoup import git from tg import app_globals as g from tg import tmpl_context as c -from ming.orm import ThreadLocalORMSession +from ming.odm import ThreadLocalORMSession from tg import ( expose, flash, diff --git a/ForgeImporters/forgeimporters/trac/tests/test_tickets.py b/ForgeImporters/forgeimporters/trac/tests/test_tickets.py index 1789654d7..05b6c4817 100644 --- a/ForgeImporters/forgeimporters/trac/tests/test_tickets.py +++ b/ForgeImporters/forgeimporters/trac/tests/test_tickets.py @@ -20,7 +20,7 @@ import os from unittest import TestCase, skipIf from mock import Mock, patch -from ming.orm import ThreadLocalORMSession +from ming.odm import ThreadLocalORMSession from tg import tmpl_context as c from allura.tests import TestController diff --git a/ForgeImporters/forgeimporters/trac/tickets.py b/ForgeImporters/forgeimporters/trac/tickets.py index 927ee31fe..a78b1efdf 100644 --- a/ForgeImporters/forgeimporters/trac/tickets.py +++ b/ForgeImporters/forgeimporters/trac/tickets.py @@ -18,7 +18,7 @@ import json import re -from ming.orm import session +from ming.odm import session from tg import tmpl_context as c from tg import app_globals as g from tg import ( diff --git a/ForgeSVN/forgesvn/model/svn.py b/ForgeSVN/forgesvn/model/svn.py index 6501374c5..06279d06b 100644 --- a/ForgeSVN/forgesvn/model/svn.py +++ b/ForgeSVN/forgesvn/model/svn.py @@ -39,7 +39,7 @@ from pymongo.errors import DuplicateKeyError from tg import tmpl_context as c, app_globals as g from ming.base import Object -from ming.orm import Mapper, FieldProperty +from ming.odm import Mapper, FieldProperty from ming.utils import LazyProperty from allura import model as M diff --git a/ForgeSVN/forgesvn/svn_main.py b/ForgeSVN/forgesvn/svn_main.py index c3326210c..942f82ab5 100644 --- a/ForgeSVN/forgesvn/svn_main.py +++ b/ForgeSVN/forgesvn/svn_main.py @@ -22,7 +22,7 @@ from tg import tmpl_context as c, request # Non-stdlib imports from ming.utils import LazyProperty -from ming.orm.ormsession import ThreadLocalORMSession +from ming.odm.ormsession import ThreadLocalORMSession from tg import expose, redirect, validate, flash from tg.decorators import with_trailing_slash, without_trailing_slash from timermiddleware import Timer diff --git a/ForgeSVN/forgesvn/tests/functional/test_controllers.py b/ForgeSVN/forgesvn/tests/functional/test_controllers.py index 6b0bea243..afc561af9 100644 --- a/ForgeSVN/forgesvn/tests/functional/test_controllers.py +++ b/ForgeSVN/forgesvn/tests/functional/test_controllers.py @@ -23,7 +23,7 @@ from unittest import skipUnless import tg import pkg_resources from tg import tmpl_context as c -from ming.orm import ThreadLocalORMSession +from ming.odm import ThreadLocalORMSession from mock import patch from allura import model as M diff --git a/ForgeSVN/forgesvn/tests/model/test_repository.py b/ForgeSVN/forgesvn/tests/model/test_repository.py index 4716bff9f..c6834f0a0 100644 --- a/ForgeSVN/forgesvn/tests/model/test_repository.py +++ b/ForgeSVN/forgesvn/tests/model/test_repository.py @@ -32,7 +32,7 @@ import mock import tg import ming from ming.base import Object -from ming.orm import session, ThreadLocalORMSession +from ming.odm import session, ThreadLocalORMSession from testfixtures import TempDirectory from alluratest.controller import setup_basic_test, setup_global_objects diff --git a/ForgeSVN/forgesvn/tests/test_svn_app.py b/ForgeSVN/forgesvn/tests/test_svn_app.py index 80d3357bc..125dac6b5 100644 --- a/ForgeSVN/forgesvn/tests/test_svn_app.py +++ b/ForgeSVN/forgesvn/tests/test_svn_app.py @@ -18,7 +18,7 @@ import unittest from tg import tmpl_context as c -from ming.orm import ThreadLocalORMSession +from ming.odm import ThreadLocalORMSession from alluratest.controller import setup_basic_test, setup_global_objects from allura.lib import helpers as h diff --git a/ForgeShortUrl/forgeshorturl/model/shorturl.py b/ForgeShortUrl/forgeshorturl/model/shorturl.py index 140b913a2..605eb690b 100644 --- a/ForgeShortUrl/forgeshorturl/model/shorturl.py +++ b/ForgeShortUrl/forgeshorturl/model/shorturl.py @@ -19,7 +19,7 @@ import typing import pymongo from tg import config from tg import tmpl_context as c -from ming.orm import FieldProperty, ForeignIdProperty, session +from ming.odm import FieldProperty, ForeignIdProperty, session from datetime import datetime from allura.model.auth import User from allura import model as M diff --git a/ForgeTracker/forgetracker/command/fix_discussion.py b/ForgeTracker/forgetracker/command/fix_discussion.py index a0d090d63..04b1d02cd 100644 --- a/ForgeTracker/forgetracker/command/fix_discussion.py +++ b/ForgeTracker/forgetracker/command/fix_discussion.py @@ -17,7 +17,7 @@ from bson import ObjectId from bson.errors import InvalidId -from ming.orm import ThreadLocalORMSession +from ming.odm import ThreadLocalORMSession from tg import tmpl_context as c from allura.command import base diff --git a/ForgeTracker/forgetracker/import_support.py b/ForgeTracker/forgetracker/import_support.py index 13f094162..c05cbb1cc 100644 --- a/ForgeTracker/forgetracker/import_support.py +++ b/ForgeTracker/forgetracker/import_support.py @@ -22,7 +22,7 @@ from io import BytesIO # Non-stdlib imports from tg import tmpl_context as c -from ming.orm.ormsession import ThreadLocalORMSession +from ming.odm.ormsession import ThreadLocalORMSession # Pyforge-specific imports from allura import model as M diff --git a/ForgeTracker/forgetracker/model/ticket.py b/ForgeTracker/forgetracker/model/ticket.py index 562a30fd0..02fc5151f 100644 --- a/ForgeTracker/forgetracker/model/ticket.py +++ b/ForgeTracker/forgetracker/model/ticket.py @@ -37,10 +37,10 @@ import markupsafe from ming import schema from ming.utils import LazyProperty -from ming.orm import Mapper, session -from ming.orm import FieldProperty, ForeignIdProperty, RelationProperty -from ming.orm.declarative import MappedClass -from ming.orm.ormsession import ThreadLocalORMSession +from ming.odm import Mapper, session +from ming.odm import FieldProperty, ForeignIdProperty, RelationProperty +from ming.odm.declarative import MappedClass +from ming.odm.ormsession import ThreadLocalORMSession from tg import config as tg_config diff --git a/ForgeTracker/forgetracker/tests/command/test_fix_discussion.py b/ForgeTracker/forgetracker/tests/command/test_fix_discussion.py index e31609b77..f9254ea78 100644 --- a/ForgeTracker/forgetracker/tests/command/test_fix_discussion.py +++ b/ForgeTracker/forgetracker/tests/command/test_fix_discussion.py @@ -15,7 +15,7 @@ # specific language governing permissions and limitations # under the License. -from ming.orm import session +from ming.odm import session import pkg_resources from alluratest.controller import setup_basic_test, setup_global_objects diff --git a/ForgeTracker/forgetracker/tests/functional/test_root.py b/ForgeTracker/forgetracker/tests/functional/test_root.py index 54a631f96..8ade91410 100644 --- a/ForgeTracker/forgetracker/tests/functional/test_root.py +++ b/ForgeTracker/forgetracker/tests/functional/test_root.py @@ -46,7 +46,7 @@ from allura.lib.search import SearchError from allura.lib.utils import urlencode from allura.tests import decorators as td from allura.tasks import mail_tasks -from ming.orm.ormsession import ThreadLocalORMSession +from ming.odm.ormsession import ThreadLocalORMSession import six diff --git a/ForgeTracker/forgetracker/tests/test_app.py b/ForgeTracker/forgetracker/tests/test_app.py index 66d8af6e5..c65e143e4 100644 --- a/ForgeTracker/forgetracker/tests/test_app.py +++ b/ForgeTracker/forgetracker/tests/test_app.py @@ -25,7 +25,7 @@ from tg import tmpl_context as c from cgi import FieldStorage from alluratest.controller import setup_basic_test -from ming.orm import ThreadLocalORMSession +from ming.odm import ThreadLocalORMSession from allura import model as M from allura.tests import decorators as td diff --git a/ForgeTracker/forgetracker/tests/unit/__init__.py b/ForgeTracker/forgetracker/tests/unit/__init__.py index 3a23685cf..5fbf553a2 100644 --- a/ForgeTracker/forgetracker/tests/unit/__init__.py +++ b/ForgeTracker/forgetracker/tests/unit/__init__.py @@ -17,7 +17,7 @@ from tg import tmpl_context as c import tg -from ming.orm.ormsession import ThreadLocalORMSession +from ming.odm.ormsession import ThreadLocalORMSession from webob import Request from allura.websetup import bootstrap diff --git a/ForgeTracker/forgetracker/tests/unit/test_globals_model.py b/ForgeTracker/forgetracker/tests/unit/test_globals_model.py index 0b508fc60..f05358308 100644 --- a/ForgeTracker/forgetracker/tests/unit/test_globals_model.py +++ b/ForgeTracker/forgetracker/tests/unit/test_globals_model.py @@ -19,7 +19,7 @@ from datetime import datetime, timedelta import mock from tg import tmpl_context as c -from ming.orm.ormsession import ThreadLocalORMSession +from ming.odm.ormsession import ThreadLocalORMSession import forgetracker from forgetracker.model import Globals diff --git a/ForgeTracker/forgetracker/tests/unit/test_root_controller.py b/ForgeTracker/forgetracker/tests/unit/test_root_controller.py index ac0157381..d9f5a6811 100644 --- a/ForgeTracker/forgetracker/tests/unit/test_root_controller.py +++ b/ForgeTracker/forgetracker/tests/unit/test_root_controller.py @@ -18,7 +18,7 @@ import unittest from mock import Mock, patch -from ming.orm.ormsession import session +from ming.odm.ormsession import session from tg import tmpl_context as c from allura.lib import helpers as h diff --git a/ForgeTracker/forgetracker/tests/unit/test_ticket_custom_fields_form.py b/ForgeTracker/forgetracker/tests/unit/test_ticket_custom_fields_form.py index 60576d1d6..6ea1fb643 100644 --- a/ForgeTracker/forgetracker/tests/unit/test_ticket_custom_fields_form.py +++ b/ForgeTracker/forgetracker/tests/unit/test_ticket_custom_fields_form.py @@ -15,7 +15,7 @@ # specific language governing permissions and limitations # under the License. -from ming.orm.ormsession import ThreadLocalORMSession +from ming.odm.ormsession import ThreadLocalORMSession from ming.base import Object from tg import tmpl_context as c diff --git a/ForgeTracker/forgetracker/tests/unit/test_ticket_form.py b/ForgeTracker/forgetracker/tests/unit/test_ticket_form.py index a11a088d5..45f2ece93 100644 --- a/ForgeTracker/forgetracker/tests/unit/test_ticket_form.py +++ b/ForgeTracker/forgetracker/tests/unit/test_ticket_form.py @@ -15,7 +15,7 @@ # specific language governing permissions and limitations # under the License. -from ming.orm.ormsession import ThreadLocalORMSession +from ming.odm.ormsession import ThreadLocalORMSession from tg import tmpl_context as c diff --git a/ForgeTracker/forgetracker/tests/unit/test_ticket_model.py b/ForgeTracker/forgetracker/tests/unit/test_ticket_model.py index 100b1fe7f..a5d01d068 100644 --- a/ForgeTracker/forgetracker/tests/unit/test_ticket_model.py +++ b/ForgeTracker/forgetracker/tests/unit/test_ticket_model.py @@ -23,8 +23,8 @@ import six.moves.urllib.error import mock import pytest -from ming.orm.ormsession import ThreadLocalORMSession -from ming.orm import session +from ming.odm.ormsession import ThreadLocalORMSession +from ming.odm import session from ming import schema from forgetracker.model import Ticket, TicketAttachment from forgetracker.tests.unit import TrackerTestWithModel diff --git a/ForgeTracker/forgetracker/tracker_main.py b/ForgeTracker/forgetracker/tracker_main.py index 2ead3dac3..6a7b98e03 100644 --- a/ForgeTracker/forgetracker/tracker_main.py +++ b/ForgeTracker/forgetracker/tracker_main.py @@ -37,7 +37,7 @@ import feedgenerator as FG from ming import schema from ming.odm import session -from ming.orm.ormsession import ThreadLocalORMSession +from ming.odm.ormsession import ThreadLocalORMSession from ming.utils import LazyProperty # Pyforge-specific imports diff --git a/ForgeUserStats/forgeuserstats/main.py b/ForgeUserStats/forgeuserstats/main.py index a02d26d7d..a81e1811d 100644 --- a/ForgeUserStats/forgeuserstats/main.py +++ b/ForgeUserStats/forgeuserstats/main.py @@ -28,7 +28,7 @@ from .controllers.userstats import ForgeUserStatsController from forgeuserstats import version -from ming.orm import session +from ming.odm import session log = logging.getLogger(__name__) diff --git a/ForgeUserStats/forgeuserstats/model/stats.py b/ForgeUserStats/forgeuserstats/model/stats.py index 1a29108c1..fc410c11a 100644 --- a/ForgeUserStats/forgeuserstats/model/stats.py +++ b/ForgeUserStats/forgeuserstats/model/stats.py @@ -15,11 +15,11 @@ # specific language governing permissions and limitations # under the License. -from ming.orm import FieldProperty +from ming.odm import FieldProperty from ming import schema as S from datetime import datetime, timedelta import typing -from ming.orm import Mapper +from ming.odm import Mapper from tg import request from allura.lib import plugin diff --git a/ForgeWiki/forgewiki/model/wiki.py b/ForgeWiki/forgewiki/model/wiki.py index b8a21d741..e62eb4b5e 100644 --- a/ForgeWiki/forgewiki/model/wiki.py +++ b/ForgeWiki/forgewiki/model/wiki.py @@ -25,8 +25,8 @@ from tg import app_globals as g from tg import tmpl_context as context from ming import schema -from ming.orm import FieldProperty, ForeignIdProperty, Mapper, session -from ming.orm.declarative import MappedClass +from ming.odm import FieldProperty, ForeignIdProperty, Mapper, session +from ming.odm.declarative import MappedClass from tg import config as tg_config diff --git a/ForgeWiki/forgewiki/tests/functional/test_root.py b/ForgeWiki/forgewiki/tests/functional/test_root.py index b4c20af97..c7c16d3a5 100644 --- a/ForgeWiki/forgewiki/tests/functional/test_root.py +++ b/ForgeWiki/forgewiki/tests/functional/test_root.py @@ -21,7 +21,7 @@ import allura import json import PIL -from ming.orm.ormsession import ThreadLocalORMSession +from ming.odm.ormsession import ThreadLocalORMSession from mock import patch from tg import config diff --git a/ForgeWiki/forgewiki/tests/test_app.py b/ForgeWiki/forgewiki/tests/test_app.py index ca01c8291..c8c7dadfb 100644 --- a/ForgeWiki/forgewiki/tests/test_app.py +++ b/ForgeWiki/forgewiki/tests/test_app.py @@ -23,7 +23,7 @@ import os from io import BytesIO from tg import tmpl_context as c -from ming.orm import ThreadLocalORMSession +from ming.odm import ThreadLocalORMSession from allura import model as M from allura.tests import decorators as td diff --git a/ForgeWiki/forgewiki/tests/test_models.py b/ForgeWiki/forgewiki/tests/test_models.py index 4924ff66f..0411ebe86 100644 --- a/ForgeWiki/forgewiki/tests/test_models.py +++ b/ForgeWiki/forgewiki/tests/test_models.py @@ -16,7 +16,7 @@ # under the License. from tg import tmpl_context as c -from ming.orm import session +from ming.odm import session from allura.tests import TestController from allura.tests import decorators as td diff --git a/ForgeWiki/forgewiki/wiki_main.py b/ForgeWiki/forgewiki/wiki_main.py index 0c5791655..5d7c1c24d 100644 --- a/ForgeWiki/forgewiki/wiki_main.py +++ b/ForgeWiki/forgewiki/wiki_main.py @@ -30,7 +30,7 @@ from tg import tmpl_context as c, app_globals as g from tg import request from formencode import validators from webob import exc -from ming.orm import session +from ming.odm import session # Pyforge-specific imports from allura import model as M diff --git a/scripts/add_user_to_group.py b/scripts/add_user_to_group.py index 10994f3c7..03e0aa19e 100644 --- a/scripts/add_user_to_group.py +++ b/scripts/add_user_to_group.py @@ -45,7 +45,7 @@ import logging from allura import model as M from allura.lib.utils import chunked_find from allura.model import main_orm_session -from ming.orm import ThreadLocalORMSession +from ming.odm import ThreadLocalORMSession log = logging.getLogger(__name__) diff --git a/scripts/migrations/013-update-ordinals.py b/scripts/migrations/013-update-ordinals.py index 0568fa042..e47d4565e 100644 --- a/scripts/migrations/013-update-ordinals.py +++ b/scripts/migrations/013-update-ordinals.py @@ -19,8 +19,8 @@ import sys import logging from tg import tmpl_context as c -from ming.orm import session -from ming.orm.ormsession import ThreadLocalORMSession +from ming.odm import session +from ming.odm.ormsession import ThreadLocalORMSession from allura import model as M from allura.lib import utils diff --git a/scripts/migrations/015-add-neighborhood_id-to-blog-posts.py b/scripts/migrations/015-add-neighborhood_id-to-blog-posts.py index 1fa854229..61ab75688 100644 --- a/scripts/migrations/015-add-neighborhood_id-to-blog-posts.py +++ b/scripts/migrations/015-add-neighborhood_id-to-blog-posts.py @@ -18,7 +18,7 @@ import logging from tg import tmpl_context as c -from ming.orm.ormsession import ThreadLocalORMSession +from ming.odm.ormsession import ThreadLocalORMSession from forgeblog import model as BM diff --git a/scripts/migrations/018-add-svn-checkout-url.py b/scripts/migrations/018-add-svn-checkout-url.py index 2a5469cc3..9c2a4be53 100644 --- a/scripts/migrations/018-add-svn-checkout-url.py +++ b/scripts/migrations/018-add-svn-checkout-url.py @@ -16,7 +16,7 @@ # under the License. from allura import model as M -from ming.orm import ThreadLocalORMSession +from ming.odm import ThreadLocalORMSession for app in M.AppConfig.query.find(dict(tool_name="svn")).all(): if 'checkout_url' not in app.options: diff --git a/scripts/migrations/020-remove-wiki-title-slashes.py b/scripts/migrations/020-remove-wiki-title-slashes.py index 036e2a0a7..03f938a61 100644 --- a/scripts/migrations/020-remove-wiki-title-slashes.py +++ b/scripts/migrations/020-remove-wiki-title-slashes.py @@ -19,7 +19,7 @@ import logging from tg import tmpl_context as c -from ming.orm import ThreadLocalORMSession +from ming.odm import ThreadLocalORMSession from forgewiki import model as WM diff --git a/scripts/migrations/022-change-anon-display-name.py b/scripts/migrations/022-change-anon-display-name.py index dbe991169..9ac5a8eda 100644 --- a/scripts/migrations/022-change-anon-display-name.py +++ b/scripts/migrations/022-change-anon-display-name.py @@ -15,7 +15,7 @@ # specific language governing permissions and limitations # under the License. -from ming.orm.ormsession import ThreadLocalORMSession +from ming.odm.ormsession import ThreadLocalORMSession from allura import model as M diff --git a/scripts/migrations/024-migrate-custom-profile-text.py b/scripts/migrations/024-migrate-custom-profile-text.py index 662094703..3fede53c8 100644 --- a/scripts/migrations/024-migrate-custom-profile-text.py +++ b/scripts/migrations/024-migrate-custom-profile-text.py @@ -20,7 +20,7 @@ import re from tg import tmpl_context as c -from ming.orm import ThreadLocalORMSession +from ming.odm import ThreadLocalORMSession from allura import model as M from allura.lib import utils diff --git a/scripts/migrations/026-install-activity-tool.py b/scripts/migrations/026-install-activity-tool.py index c7eb39f69..c111f3957 100644 --- a/scripts/migrations/026-install-activity-tool.py +++ b/scripts/migrations/026-install-activity-tool.py @@ -17,7 +17,7 @@ import logging -from ming.orm import ThreadLocalORMSession +from ming.odm import ThreadLocalORMSession from allura.lib import utils from allura import model as M diff --git a/scripts/migrations/027-change-ticket-write-permissions.py b/scripts/migrations/027-change-ticket-write-permissions.py index 3c6877ad3..64d40466d 100644 --- a/scripts/migrations/027-change-ticket-write-permissions.py +++ b/scripts/migrations/027-change-ticket-write-permissions.py @@ -16,7 +16,7 @@ # under the License. import logging -from ming.orm import ThreadLocalORMSession +from ming.odm import ThreadLocalORMSession from allura import model as M diff --git a/scripts/migrations/028-remove-svn-trees.py b/scripts/migrations/028-remove-svn-trees.py index bb8913847..348d4f34a 100644 --- a/scripts/migrations/028-remove-svn-trees.py +++ b/scripts/migrations/028-remove-svn-trees.py @@ -17,7 +17,7 @@ import logging -from ming.orm import ThreadLocalORMSession +from ming.odm import ThreadLocalORMSession from allura.lib import utils from allura import model as M diff --git a/scripts/migrations/033-change-comment-anon-permissions.py b/scripts/migrations/033-change-comment-anon-permissions.py index f760a80fa..4344d13aa 100644 --- a/scripts/migrations/033-change-comment-anon-permissions.py +++ b/scripts/migrations/033-change-comment-anon-permissions.py @@ -17,7 +17,7 @@ import sys import logging -from ming.orm import ThreadLocalORMSession, session +from ming.odm import ThreadLocalORMSession, session from tg import tmpl_context as c from allura import model as M from forgediscussion.model import ForumPost diff --git a/scripts/migrations/034-update_subscriptions_ticket_and_mr_titles.py b/scripts/migrations/034-update_subscriptions_ticket_and_mr_titles.py index cb82382b8..b30795ab9 100644 --- a/scripts/migrations/034-update_subscriptions_ticket_and_mr_titles.py +++ b/scripts/migrations/034-update_subscriptions_ticket_and_mr_titles.py @@ -22,7 +22,7 @@ from tg import tmpl_context as c from bson import ObjectId from ming.odm import session -from ming.orm import ThreadLocalORMSession +from ming.odm import ThreadLocalORMSession from allura import model as M from forgetracker import model as TM diff --git a/scripts/perf/load-up-forum.py b/scripts/perf/load-up-forum.py index 01553c096..ac569302b 100644 --- a/scripts/perf/load-up-forum.py +++ b/scripts/perf/load-up-forum.py @@ -18,7 +18,7 @@ import logging import uuid -from ming.orm import ThreadLocalORMSession, session +from ming.odm import ThreadLocalORMSession, session from tg import tmpl_context as c from allura import model as M from forgediscussion.model import ForumPost, Forum diff --git a/scripts/project-import.py b/scripts/project-import.py index 9059e4dd8..f82d55598 100644 --- a/scripts/project-import.py +++ b/scripts/project-import.py @@ -19,7 +19,7 @@ import json import logging import sys -from ming.orm import session +from ming.odm import session import colander from allura import model as M diff --git a/scripts/publicize-neighborhood.py b/scripts/publicize-neighborhood.py index b2d208c70..b18b01c85 100644 --- a/scripts/publicize-neighborhood.py +++ b/scripts/publicize-neighborhood.py @@ -18,7 +18,7 @@ import logging import sys -from ming.orm import ThreadLocalORMSession +from ming.odm import ThreadLocalORMSession from tg import tmpl_context as c, app_globals as g from allura import model as M diff --git a/scripts/rethumb.py b/scripts/rethumb.py index 83abc82a5..824d1b992 100644 --- a/scripts/rethumb.py +++ b/scripts/rethumb.py @@ -20,7 +20,7 @@ import sys import PIL from tg import tmpl_context as c -from ming.orm import ThreadLocalORMSession, state, Mapper +from ming.odm import ThreadLocalORMSession, state, Mapper from allura.command import base from allura.lib.helpers import iter_entry_points diff --git a/scripts/scrub-allura-data.py b/scripts/scrub-allura-data.py index 28ab811ba..9f266a4d0 100644 --- a/scripts/scrub-allura-data.py +++ b/scripts/scrub-allura-data.py @@ -18,7 +18,7 @@ import logging import sys -from ming.orm import ThreadLocalORMSession +from ming.odm import ThreadLocalORMSession import mock from tg import tmpl_context as c, app_globals as g diff --git a/scripts/teamforge-import.py b/scripts/teamforge-import.py index 8b375ec51..8efabd0aa 100644 --- a/scripts/teamforge-import.py +++ b/scripts/teamforge-import.py @@ -36,7 +36,7 @@ import string import sqlalchemy from suds.client import Client -from ming.orm.ormsession import ThreadLocalORMSession +from ming.odm.ormsession import ThreadLocalORMSession from ming.base import Object from allura import model as M
