You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by br...@apache.org on 2013/02/19 19:12:44 UTC
[1/7] git commit: [#5837] one-line import changes to remove pylons.c|g
[#5837] one-line import changes to remove pylons.c|g
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/47f0f7e9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/47f0f7e9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/47f0f7e9
Branch: refs/heads/db/5837
Commit: 47f0f7e971d79b511ef88d89380c15b03ef1e888
Parents: 0435184
Author: Dave Brondsema <db...@geek.net>
Authored: Tue Feb 19 03:19:27 2013 +0000
Committer: Dave Brondsema <db...@geek.net>
Committed: Tue Feb 19 18:01:42 2013 +0000
----------------------------------------------------------------------
Allura/allura/command/reclone_repo.py | 2 +-
Allura/allura/command/script.py | 2 +-
Allura/allura/command/show_models.py | 2 +-
Allura/allura/controllers/discuss.py | 2 +-
Allura/allura/controllers/project.py | 2 +-
Allura/allura/controllers/search.py | 2 +-
Allura/allura/controllers/static.py | 2 +-
Allura/allura/ext/admin/widgets.py | 2 +-
Allura/allura/ext/project_home/project_main.py | 2 +-
Allura/allura/ext/search/search_main.py | 2 +-
Allura/allura/lib/custom_middleware.py | 2 +-
Allura/allura/lib/mail_util.py | 2 +-
Allura/allura/lib/plugin.py | 2 +-
Allura/allura/lib/repository.py | 2 +-
Allura/allura/lib/search.py | 2 +-
Allura/allura/lib/widgets/discuss.py | 2 +-
Allura/allura/lib/widgets/form_fields.py | 2 +-
Allura/allura/lib/widgets/forms.py | 2 +-
Allura/allura/lib/widgets/oauth_widgets.py | 2 +-
Allura/allura/lib/widgets/project_list.py | 2 +-
Allura/allura/lib/widgets/subscriptions.py | 2 +-
Allura/allura/model/attachments.py | 2 +-
Allura/allura/model/discuss.py | 2 +-
Allura/allura/model/index.py | 2 +-
Allura/allura/model/monq_model.py | 2 +-
Allura/allura/model/notification.py | 2 +-
Allura/allura/model/oauth.py | 2 +-
Allura/allura/model/repo.py | 2 +-
Allura/allura/model/repo_refresh.py | 2 +-
Allura/allura/model/repository.py | 2 +-
Allura/allura/model/session.py | 2 +-
Allura/allura/scripts/refreshrepo.py | 2 +-
Allura/allura/tasks/index_tasks.py | 2 +-
Allura/allura/tasks/mail_tasks.py | 2 +-
Allura/allura/tasks/repo_tasks.py | 2 +-
Allura/allura/tests/decorators.py | 2 +-
Allura/allura/tests/functional/test_auth.py | 2 +-
Allura/allura/tests/model/test_artifact.py | 2 +-
Allura/allura/tests/model/test_auth.py | 2 +-
Allura/allura/tests/model/test_neighborhood.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_app.py | 2 +-
Allura/allura/tests/test_globals.py | 2 +-
Allura/allura/tests/test_helpers.py | 2 +-
Allura/allura/tests/test_tasks.py | 2 +-
Allura/allura/tests/tscript.py | 2 +-
Allura/allura/tests/unit/patches.py | 2 +-
.../tests/unit/test_helpers/test_set_context.py | 2 +-
Allura/allura/websetup/bootstrap.py | 2 +-
Allura/docs/tutorials/wiki-tool.rst | 2 +-
Allura/test-light.py | 2 +-
ForgeActivity/forgeactivity/widgets/follow.py | 2 +-
ForgeBlog/forgeblog/command/rssfeeds.py | 2 +-
ForgeBlog/forgeblog/model/blog.py | 2 +-
ForgeBlog/forgeblog/tests/test_commands.py | 2 +-
ForgeBlog/forgeblog/tests/test_roles.py | 2 +-
ForgeBlog/forgeblog/tests/unit/__init__.py | 2 +-
ForgeBlog/forgeblog/tests/unit/test_blog_post.py | 2 +-
.../forgediscussion/controllers/forum.py | 2 +-
ForgeDiscussion/forgediscussion/import_support.py | 2 +-
ForgeDiscussion/forgediscussion/tasks.py | 2 +-
.../forgediscussion/tests/functional/test_forum.py | 2 +-
.../tests/functional/test_import.py | 2 +-
.../forgediscussion/tests/test_forum_roles.py | 2 +-
ForgeDiscussion/forgediscussion/widgets/admin.py | 2 +-
.../forgediscussion/widgets/forum_widgets.py | 2 +-
ForgeGit/forgegit/controllers.py | 2 +-
ForgeGit/forgegit/git_main.py | 2 +-
.../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 +-
ForgeSVN/forgesvn/controllers.py | 2 +-
.../forgesvn/tests/functional/test_controllers.py | 2 +-
ForgeSVN/forgesvn/tests/model/test_repository.py | 2 +-
ForgeSVN/forgesvn/tests/test_svn_app.py | 2 +-
ForgeSVN/forgesvn/tests/test_tasks.py | 2 +-
ForgeShortUrl/forgeshorturl/main.py | 2 +-
ForgeShortUrl/forgeshorturl/model/shorturl.py | 2 +-
.../forgeshorturl/tests/functional/test.py | 2 +-
ForgeTracker/forgetracker/import_support.py | 2 +-
ForgeTracker/forgetracker/model/ticket.py | 2 +-
ForgeTracker/forgetracker/tasks.py | 2 +-
.../forgetracker/tests/functional/test_import.py | 2 +-
.../forgetracker/tests/functional/test_rest.py | 2 +-
.../forgetracker/tests/test_tracker_roles.py | 2 +-
ForgeTracker/forgetracker/tests/unit/__init__.py | 2 +-
.../forgetracker/tests/unit/test_globals_model.py | 2 +-
.../tests/unit/test_milestone_controller.py | 2 +-
.../tests/unit/test_root_controller.py | 2 +-
.../tests/unit/test_ticket_custom_fields_form.py | 2 +-
.../forgetracker/tests/unit/test_ticket_form.py | 2 +-
.../forgetracker/tests/unit/test_ticket_model.py | 4 ++--
.../forgetracker/widgets/admin_custom_fields.py | 2 +-
ForgeTracker/forgetracker/widgets/ticket_form.py | 2 +-
ForgeTracker/forgetracker/widgets/ticket_search.py | 2 +-
.../forgewiki/command/wiki2markdown/loaders.py | 2 +-
ForgeWiki/forgewiki/tests/test_wiki_roles.py | 2 +-
scripts/create-allura-sitemap.py | 2 +-
scripts/migrate_project_database.py | 2 +-
scripts/migrations/000-fix-tracker-fields.py | 2 +-
scripts/migrations/001-restore-labels.py | 2 +-
.../migrations/002-fix-tracker-thread-subjects.py | 2 +-
scripts/migrations/003-migrate_project_roles.py | 2 +-
.../migrations/004-make-attachments-polymorphic.py | 2 +-
scripts/migrations/006-migrate-artifact-refs.py | 2 +-
scripts/migrations/007-update-acls.py | 2 +-
scripts/migrations/010-fix-home-permissions.py | 2 +-
scripts/migrations/012-uninstall-home.py | 2 +-
scripts/migrations/013-update-ordinals.py | 2 +-
scripts/migrations/014-add-trove-category-agpl.py | 2 +-
.../015-add-neighborhood_id-to-blog-posts.py | 2 +-
scripts/migrations/016-add-trove-category-lppl.py | 2 +-
scripts/migrations/017-sync-trove-categories.py | 2 +-
.../migrations/020-remove-wiki-title-slashes.py | 2 +-
.../migrations/024-migrate-custom-profile-text.py | 2 +-
scripts/migrations/025-add-is-nbhd-project.py | 2 +-
.../027-change-ticket-write-permissions.py | 2 +-
scripts/project-import.py | 2 +-
scripts/publicize-neighborhood.py | 2 +-
scripts/refresh-last-commits.py | 2 +-
scripts/rethumb.py | 2 +-
scripts/scrub-allura-data.py | 2 +-
scripts/teamforge-import.py | 2 +-
126 files changed, 127 insertions(+), 127 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/Allura/allura/command/reclone_repo.py
----------------------------------------------------------------------
diff --git a/Allura/allura/command/reclone_repo.py b/Allura/allura/command/reclone_repo.py
index a677f0e..a4e5fe1 100644
--- a/Allura/allura/command/reclone_repo.py
+++ b/Allura/allura/command/reclone_repo.py
@@ -1,6 +1,6 @@
import warnings
-from pylons import c
+from pylons import tmpl_context as c
from allura import model as M
from allura.tasks import repo_tasks
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/Allura/allura/command/script.py
----------------------------------------------------------------------
diff --git a/Allura/allura/command/script.py b/Allura/allura/command/script.py
index efff6db..e2538ee 100644
--- a/Allura/allura/command/script.py
+++ b/Allura/allura/command/script.py
@@ -3,7 +3,7 @@ import os.path
import cProfile
import warnings
-from pylons import c
+from pylons import tmpl_context as c
import pylons
import webob
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/Allura/allura/command/show_models.py
----------------------------------------------------------------------
diff --git a/Allura/allura/command/show_models.py b/Allura/allura/command/show_models.py
index 7dc1c0a..6934424 100644
--- a/Allura/allura/command/show_models.py
+++ b/Allura/allura/command/show_models.py
@@ -2,7 +2,7 @@ import sys
from collections import defaultdict
from itertools import groupby
-from pylons import c, g
+from pylons import tmpl_context as c, app_globals as g
from pymongo.errors import DuplicateKeyError
from ming.orm import mapper, session, Mapper
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/Allura/allura/controllers/discuss.py
----------------------------------------------------------------------
diff --git a/Allura/allura/controllers/discuss.py b/Allura/allura/controllers/discuss.py
index 9851f4b..577440e 100644
--- a/Allura/allura/controllers/discuss.py
+++ b/Allura/allura/controllers/discuss.py
@@ -3,7 +3,7 @@ from datetime import datetime
from tg import expose, redirect, validate, request, response, flash
from tg.decorators import before_validate, with_trailing_slash, without_trailing_slash
-from pylons import g, c
+from pylons import tmpl_context as c, app_globals as g
from formencode import validators
from webob import exc
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/Allura/allura/controllers/project.py
----------------------------------------------------------------------
diff --git a/Allura/allura/controllers/project.py b/Allura/allura/controllers/project.py
index 5aa9e02..20c05d7 100644
--- a/Allura/allura/controllers/project.py
+++ b/Allura/allura/controllers/project.py
@@ -7,7 +7,7 @@ from itertools import chain, islice
from bson import ObjectId
from tg import expose, flash, redirect, validate, request, response, config
from tg.decorators import with_trailing_slash, without_trailing_slash
-from pylons import c, g
+from pylons import tmpl_context as c, app_globals as g
from paste.deploy.converters import asbool
from webob import exc
import pymongo
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/Allura/allura/controllers/search.py
----------------------------------------------------------------------
diff --git a/Allura/allura/controllers/search.py b/Allura/allura/controllers/search.py
index f7ecebf..9b1f9f8 100644
--- a/Allura/allura/controllers/search.py
+++ b/Allura/allura/controllers/search.py
@@ -1,7 +1,7 @@
from tg import expose, redirect, flash, config, validate, request
from tg.decorators import with_trailing_slash, without_trailing_slash
from formencode import validators as V
-from pylons import c
+from pylons import tmpl_context as c
from webob import exc
import pymongo
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/Allura/allura/controllers/static.py
----------------------------------------------------------------------
diff --git a/Allura/allura/controllers/static.py b/Allura/allura/controllers/static.py
index 0ddd3e0..dfdacee 100644
--- a/Allura/allura/controllers/static.py
+++ b/Allura/allura/controllers/static.py
@@ -5,7 +5,7 @@ from tg import expose, redirect, flash, config, validate, request, response
from tg.decorators import with_trailing_slash, without_trailing_slash
from webob import exc
-from pylons import c, g
+from pylons import tmpl_context as c, app_globals as g
from allura.lib import helpers as h
from allura import model as M
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/Allura/allura/ext/admin/widgets.py
----------------------------------------------------------------------
diff --git a/Allura/allura/ext/admin/widgets.py b/Allura/allura/ext/admin/widgets.py
index 9c8d886..7075911 100644
--- a/Allura/allura/ext/admin/widgets.py
+++ b/Allura/allura/ext/admin/widgets.py
@@ -1,4 +1,4 @@
-from pylons import g, c
+from pylons import tmpl_context as c, app_globals as g
import ew as ew_core
from ew import jinja2_ew as ew
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/Allura/allura/ext/project_home/project_main.py
----------------------------------------------------------------------
diff --git a/Allura/allura/ext/project_home/project_main.py b/Allura/allura/ext/project_home/project_main.py
index 96c706a..70c781d 100644
--- a/Allura/allura/ext/project_home/project_main.py
+++ b/Allura/allura/ext/project_home/project_main.py
@@ -1,7 +1,7 @@
import logging
import pkg_resources
-from pylons import c
+from pylons import tmpl_context as c
from tg import expose, redirect
from tg.decorators import with_trailing_slash
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/Allura/allura/ext/search/search_main.py
----------------------------------------------------------------------
diff --git a/Allura/allura/ext/search/search_main.py b/Allura/allura/ext/search/search_main.py
index 2f9b240..84da0b1 100644
--- a/Allura/allura/ext/search/search_main.py
+++ b/Allura/allura/ext/search/search_main.py
@@ -1,7 +1,7 @@
import logging
import pkg_resources
-from pylons import c
+from pylons import tmpl_context as c
from tg import expose, validate
from tg.decorators import with_trailing_slash
from formencode import validators as V
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/Allura/allura/lib/custom_middleware.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/custom_middleware.py b/Allura/allura/lib/custom_middleware.py
index 2fd7d04..1c63867 100644
--- a/Allura/allura/lib/custom_middleware.py
+++ b/Allura/allura/lib/custom_middleware.py
@@ -6,7 +6,7 @@ from contextlib import contextmanager
import tg
import pkg_resources
from paste import fileapp
-from pylons import c
+from pylons import tmpl_context as c
from pylons.util import call_wsgi_application
from timermiddleware import Timer, TimerMiddleware
from webob import exc, Request
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/Allura/allura/lib/mail_util.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/mail_util.py b/Allura/allura/lib/mail_util.py
index 3387351..8a0c41e 100644
--- a/Allura/allura/lib/mail_util.py
+++ b/Allura/allura/lib/mail_util.py
@@ -9,7 +9,7 @@ from email import header
import tg
from paste.deploy.converters import asbool, asint
from formencode import validators as fev
-from pylons import c
+from pylons import tmpl_context as c
from allura.lib.utils import ConfigProxy
from allura.lib import exceptions as exc
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/Allura/allura/lib/plugin.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/plugin.py b/Allura/allura/lib/plugin.py
index dbd159e..0c2aae2 100644
--- a/Allura/allura/lib/plugin.py
+++ b/Allura/allura/lib/plugin.py
@@ -21,7 +21,7 @@ except ImportError:
ldap = modlist = None
import pkg_resources
from tg import config
-from pylons import g, c
+from pylons import tmpl_context as c, app_globals as g
from webob import exc
from bson.tz_util import FixedOffset
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/Allura/allura/lib/repository.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/repository.py b/Allura/allura/lib/repository.py
index 9d3528c..383ef30 100644
--- a/Allura/allura/lib/repository.py
+++ b/Allura/allura/lib/repository.py
@@ -2,7 +2,7 @@ import logging
import shutil
from urllib import quote
-from pylons import c, g
+from pylons import tmpl_context as c, app_globals as g
from tg import expose, redirect, url
from tg.decorators import with_trailing_slash, without_trailing_slash
from bson import ObjectId
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/Allura/allura/lib/search.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/search.py b/Allura/allura/lib/search.py
index d9b1b48..4d73c83 100644
--- a/Allura/allura/lib/search.py
+++ b/Allura/allura/lib/search.py
@@ -6,7 +6,7 @@ from pprint import pformat
from itertools import islice, chain
import markdown
-from pylons import c,g
+from pylons import tmpl_context as c, app_globals as g
from pysolr import SolrError
from . import helpers as h
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/Allura/allura/lib/widgets/discuss.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/widgets/discuss.py b/Allura/allura/lib/widgets/discuss.py
index 3c28d09..f813404 100644
--- a/Allura/allura/lib/widgets/discuss.py
+++ b/Allura/allura/lib/widgets/discuss.py
@@ -1,4 +1,4 @@
-from pylons import c,g
+from pylons import tmpl_context as c, app_globals as g
from formencode import validators as fev
import ew as ew_core
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/Allura/allura/lib/widgets/form_fields.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/widgets/form_fields.py b/Allura/allura/lib/widgets/form_fields.py
index 144c0ea..cc845d1 100644
--- a/Allura/allura/lib/widgets/form_fields.py
+++ b/Allura/allura/lib/widgets/form_fields.py
@@ -1,4 +1,4 @@
-from pylons import c,g
+from pylons import tmpl_context as c, app_globals as g
from tg import request, url
import json
import logging
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/Allura/allura/lib/widgets/forms.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/widgets/forms.py b/Allura/allura/lib/widgets/forms.py
index 037f136..f76eff3 100644
--- a/Allura/allura/lib/widgets/forms.py
+++ b/Allura/allura/lib/widgets/forms.py
@@ -1,6 +1,6 @@
import logging
import warnings
-from pylons import g
+from pylons import app_globals as g
from allura.lib import validators as V
from allura.lib import helpers as h
from allura.lib import plugin
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/Allura/allura/lib/widgets/oauth_widgets.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/widgets/oauth_widgets.py b/Allura/allura/lib/widgets/oauth_widgets.py
index 2f5b793..910635e 100644
--- a/Allura/allura/lib/widgets/oauth_widgets.py
+++ b/Allura/allura/lib/widgets/oauth_widgets.py
@@ -1,4 +1,4 @@
-from pylons import c
+from pylons import tmpl_context as c
import ew as ew_core
import ew.jinja2_ew as ew
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/Allura/allura/lib/widgets/project_list.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/widgets/project_list.py b/Allura/allura/lib/widgets/project_list.py
index c98fcdb..1d90690 100644
--- a/Allura/allura/lib/widgets/project_list.py
+++ b/Allura/allura/lib/widgets/project_list.py
@@ -1,7 +1,7 @@
import ew as ew_core
import ew.jinja2_ew as ew
-from pylons import g, c
+from pylons import tmpl_context as c, app_globals as g
from allura import model as M
from allura.lib.security import Credentials
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/Allura/allura/lib/widgets/subscriptions.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/widgets/subscriptions.py b/Allura/allura/lib/widgets/subscriptions.py
index 0ab44b2..f6cd142 100644
--- a/Allura/allura/lib/widgets/subscriptions.py
+++ b/Allura/allura/lib/widgets/subscriptions.py
@@ -1,4 +1,4 @@
-from pylons import c
+from pylons import tmpl_context as c
import ew as ew_core
import ew.jinja2_ew as ew
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/Allura/allura/model/attachments.py
----------------------------------------------------------------------
diff --git a/Allura/allura/model/attachments.py b/Allura/allura/model/attachments.py
index fcec088..767d514 100644
--- a/Allura/allura/model/attachments.py
+++ b/Allura/allura/model/attachments.py
@@ -1,4 +1,4 @@
-from pylons import c
+from pylons import tmpl_context as c
from ming.orm import FieldProperty
from ming import schema as S
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/Allura/allura/model/discuss.py
----------------------------------------------------------------------
diff --git a/Allura/allura/model/discuss.py b/Allura/allura/model/discuss.py
index 7c263cd..9d26242 100644
--- a/Allura/allura/model/discuss.py
+++ b/Allura/allura/model/discuss.py
@@ -3,7 +3,7 @@ from datetime import datetime
import pymongo
from pymongo.errors import DuplicateKeyError
-from pylons import c, g
+from pylons import tmpl_context as c, app_globals as g
from ming import schema
from ming.orm.base import session
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/Allura/allura/model/index.py
----------------------------------------------------------------------
diff --git a/Allura/allura/model/index.py b/Allura/allura/model/index.py
index 5772d20..3a93a0a 100644
--- a/Allura/allura/model/index.py
+++ b/Allura/allura/model/index.py
@@ -7,7 +7,7 @@ from urllib import unquote
import bson
import pymongo
-from pylons import c
+from pylons import tmpl_context as c
from ming import collection, Field, Index
from ming import schema as S
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/Allura/allura/model/monq_model.py
----------------------------------------------------------------------
diff --git a/Allura/allura/model/monq_model.py b/Allura/allura/model/monq_model.py
index 02852b0..bdb1d90 100644
--- a/Allura/allura/model/monq_model.py
+++ b/Allura/allura/model/monq_model.py
@@ -5,7 +5,7 @@ import logging
from datetime import datetime, timedelta
import pymongo
-from pylons import c, g
+from pylons import tmpl_context as c, app_globals as g
import ming
from ming.utils import LazyProperty
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/Allura/allura/model/notification.py
----------------------------------------------------------------------
diff --git a/Allura/allura/model/notification.py b/Allura/allura/model/notification.py
index ea45045..6a9f559 100644
--- a/Allura/allura/model/notification.py
+++ b/Allura/allura/model/notification.py
@@ -20,7 +20,7 @@ from bson import ObjectId
from datetime import datetime, timedelta
from collections import defaultdict
-from pylons import c, g
+from pylons import tmpl_context as c, app_globals as g
from tg import config
import pymongo
import jinja2
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/Allura/allura/model/oauth.py
----------------------------------------------------------------------
diff --git a/Allura/allura/model/oauth.py b/Allura/allura/model/oauth.py
index 0459e6a..5ba0901 100644
--- a/Allura/allura/model/oauth.py
+++ b/Allura/allura/model/oauth.py
@@ -1,7 +1,7 @@
import logging
import oauth2 as oauth
-from pylons import c, g
+from pylons import tmpl_context as c, app_globals as g
from ming import schema as S
from ming.orm import FieldProperty, RelationProperty, ForeignIdProperty
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/Allura/allura/model/repo.py
----------------------------------------------------------------------
diff --git a/Allura/allura/model/repo.py b/Allura/allura/model/repo.py
index 569cbb3..31c03ad 100644
--- a/Allura/allura/model/repo.py
+++ b/Allura/allura/model/repo.py
@@ -9,7 +9,7 @@ from collections import defaultdict, OrderedDict
from difflib import SequenceMatcher, unified_diff
import bson
-from pylons import c
+from pylons import tmpl_context as c
import pymongo.errors
from ming import Field, collection, Index
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/Allura/allura/model/repo_refresh.py
----------------------------------------------------------------------
diff --git a/Allura/allura/model/repo_refresh.py b/Allura/allura/model/repo_refresh.py
index bdd5a1f..adb2b33 100644
--- a/Allura/allura/model/repo_refresh.py
+++ b/Allura/allura/model/repo_refresh.py
@@ -8,7 +8,7 @@ import bson
import tg
-from pylons import g,c
+from pylons import tmpl_context as c, app_globals as g
from ming.base import Object
from ming.orm import mapper, session, ThreadLocalORMSession
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/Allura/allura/model/repository.py
----------------------------------------------------------------------
diff --git a/Allura/allura/model/repository.py b/Allura/allura/model/repository.py
index 05dc771..7c1b1f6 100644
--- a/Allura/allura/model/repository.py
+++ b/Allura/allura/model/repository.py
@@ -14,7 +14,7 @@ from itertools import izip
import tg
from paste.deploy.converters import asbool
-from pylons import c
+from pylons import tmpl_context as c
from pylons import app_globals as g
import pymongo.errors
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/Allura/allura/model/session.py
----------------------------------------------------------------------
diff --git a/Allura/allura/model/session.py b/Allura/allura/model/session.py
index f3d5e22..11107bc 100644
--- a/Allura/allura/model/session.py
+++ b/Allura/allura/model/session.py
@@ -31,7 +31,7 @@ class ArtifactSessionExtension(SessionExtension):
def after_flush(self, obj=None):
"Update artifact references, and add/update this artifact to solr"
if not getattr(self.session, 'disable_artifact_index', False):
- from pylons import g
+ from pylons import app_globals as g
from .index import ArtifactReference, Shortlink
from .session import main_orm_session
# Ensure artifact references & shortlinks exist for new objects
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/Allura/allura/scripts/refreshrepo.py
----------------------------------------------------------------------
diff --git a/Allura/allura/scripts/refreshrepo.py b/Allura/allura/scripts/refreshrepo.py
index fb6453b..94e7425 100644
--- a/Allura/allura/scripts/refreshrepo.py
+++ b/Allura/allura/scripts/refreshrepo.py
@@ -3,7 +3,7 @@ import logging
import re
import faulthandler
-from pylons import c
+from pylons import tmpl_context as c
from ming.orm import ThreadLocalORMSession
from allura import model as M
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/Allura/allura/tasks/index_tasks.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tasks/index_tasks.py b/Allura/allura/tasks/index_tasks.py
index 84c7abe..3617109 100644
--- a/Allura/allura/tasks/index_tasks.py
+++ b/Allura/allura/tasks/index_tasks.py
@@ -2,7 +2,7 @@ import sys
import logging
from contextlib import contextmanager
-from pylons import g
+from pylons import app_globals as g
from allura.lib.decorators import task
from allura.lib.exceptions import CompoundError
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/Allura/allura/tasks/mail_tasks.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tasks/mail_tasks.py b/Allura/allura/tasks/mail_tasks.py
index c742283..4b1de79 100644
--- a/Allura/allura/tasks/mail_tasks.py
+++ b/Allura/allura/tasks/mail_tasks.py
@@ -1,6 +1,6 @@
import logging
-from pylons import c, g
+from pylons import tmpl_context as c, app_globals as g
from bson import ObjectId
from allura.lib import helpers as h
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/Allura/allura/tasks/repo_tasks.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tasks/repo_tasks.py b/Allura/allura/tasks/repo_tasks.py
index 9a6820f..355daf7 100644
--- a/Allura/allura/tasks/repo_tasks.py
+++ b/Allura/allura/tasks/repo_tasks.py
@@ -2,7 +2,7 @@ import shutil
import logging
import traceback
-from pylons import c, g
+from pylons import tmpl_context as c, app_globals as g
from allura.lib.decorators import task
from allura.lib.repository import RepositoryApp
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/Allura/allura/tests/decorators.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/decorators.py b/Allura/allura/tests/decorators.py
index 0222bdb..62afb0b 100644
--- a/Allura/allura/tests/decorators.py
+++ b/Allura/allura/tests/decorators.py
@@ -4,7 +4,7 @@ from allura import model as M
from ming.orm.ormsession import ThreadLocalORMSession
-from pylons import c
+from pylons import tmpl_context as c
def with_user_project(username):
def _with_user_project(func):
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/Allura/allura/tests/functional/test_auth.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/functional/test_auth.py b/Allura/allura/tests/functional/test_auth.py
index 0f51df2..d7b5f89 100644
--- a/Allura/allura/tests/functional/test_auth.py
+++ b/Allura/allura/tests/functional/test_auth.py
@@ -5,7 +5,7 @@ import mock
from nose.tools import assert_equal
from datadiff.tools import assert_equal
-from pylons import c
+from pylons import tmpl_context as c
from allura.tests import TestController
from allura.tests import decorators as td
from allura import model as M
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/Allura/allura/tests/model/test_artifact.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/model/test_artifact.py b/Allura/allura/tests/model/test_artifact.py
index 0a621a7..0ad9d49 100644
--- a/Allura/allura/tests/model/test_artifact.py
+++ b/Allura/allura/tests/model/test_artifact.py
@@ -5,7 +5,7 @@ Model tests for artifact
import re
from datetime import datetime
-from pylons import c
+from pylons import tmpl_context as c
from nose.tools import assert_raises
from nose import with_setup
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/Allura/allura/tests/model/test_auth.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/model/test_auth.py b/Allura/allura/tests/model/test_auth.py
index 191e382..8fd0b65 100644
--- a/Allura/allura/tests/model/test_auth.py
+++ b/Allura/allura/tests/model/test_auth.py
@@ -3,7 +3,7 @@
Model tests for auth
"""
from nose.tools import with_setup, assert_equal
-from pylons import c, g
+from pylons import tmpl_context as c, app_globals as g
from webob import Request
from pymongo.errors import DuplicateKeyError
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/Allura/allura/tests/model/test_neighborhood.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/model/test_neighborhood.py b/Allura/allura/tests/model/test_neighborhood.py
index 7c1c47a..eff54dc 100644
--- a/Allura/allura/tests/model/test_neighborhood.py
+++ b/Allura/allura/tests/model/test_neighborhood.py
@@ -3,7 +3,7 @@
Model tests for neighborhood
"""
from nose.tools import with_setup
-from pylons import c
+from pylons import tmpl_context as c
from ming.orm.ormsession import ThreadLocalORMSession
from allura import model as M
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/Allura/allura/tests/model/test_notification.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/model/test_notification.py b/Allura/allura/tests/model/test_notification.py
index 7cca4ab..92e244f 100644
--- a/Allura/allura/tests/model/test_notification.py
+++ b/Allura/allura/tests/model/test_notification.py
@@ -1,7 +1,7 @@
import unittest
from datetime import timedelta
-from pylons import g, c
+from pylons import tmpl_context as c, app_globals as g
from nose.tools import assert_equal, assert_in
from ming.orm import ThreadLocalORMSession
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/Allura/allura/tests/model/test_project.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/model/test_project.py b/Allura/allura/tests/model/test_project.py
index 064901f..5303928 100644
--- a/Allura/allura/tests/model/test_project.py
+++ b/Allura/allura/tests/model/test_project.py
@@ -3,7 +3,7 @@
Model tests for project
"""
from nose.tools import with_setup
-from pylons import c
+from pylons import tmpl_context as c
from ming.orm.ormsession import ThreadLocalORMSession
from allura import model as M
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/Allura/allura/tests/model/test_repo.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/model/test_repo.py b/Allura/allura/tests/model/test_repo.py
index bba9042..6696cb7 100644
--- a/Allura/allura/tests/model/test_repo.py
+++ b/Allura/allura/tests/model/test_repo.py
@@ -3,7 +3,7 @@ from collections import defaultdict, OrderedDict
import unittest
import mock
from nose.tools import assert_equal
-from pylons import c
+from pylons import tmpl_context as c
from bson import ObjectId
from ming.orm import session
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/Allura/allura/tests/test_app.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/test_app.py b/Allura/allura/tests/test_app.py
index 359e796..8adb1bd 100644
--- a/Allura/allura/tests/test_app.py
+++ b/Allura/allura/tests/test_app.py
@@ -1,7 +1,7 @@
import re
import unittest
-from pylons import c, g
+from pylons import tmpl_context as c, app_globals as g
import mock
from ming.base import Object
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/Allura/allura/tests/test_globals.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/test_globals.py b/Allura/allura/tests/test_globals.py
index a11919c..ee1c347 100644
--- a/Allura/allura/tests/test_globals.py
+++ b/Allura/allura/tests/test_globals.py
@@ -6,7 +6,7 @@ from urllib import quote
from bson import ObjectId
from nose.tools import with_setup, assert_equal
-from pylons import g, c
+from pylons import tmpl_context as c, app_globals as g
from ming.orm import ThreadLocalORMSession
from alluratest.controller import setup_basic_test, setup_global_objects
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/Allura/allura/tests/test_helpers.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/test_helpers.py b/Allura/allura/tests/test_helpers.py
index 12dcfa3..4eaa7ec 100644
--- a/Allura/allura/tests/test_helpers.py
+++ b/Allura/allura/tests/test_helpers.py
@@ -1,7 +1,7 @@
from os import path
from mock import Mock, patch
-from pylons import c
+from pylons import tmpl_context as c
from nose.tools import eq_, assert_equals
from allura import model as M
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/Allura/allura/tests/test_tasks.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/test_tasks.py b/Allura/allura/tests/test_tasks.py
index bd1bc04..b7bfdbf 100644
--- a/Allura/allura/tests/test_tasks.py
+++ b/Allura/allura/tests/test_tasks.py
@@ -8,7 +8,7 @@ import mock
import pylons
pylons.c = pylons.tmpl_context
pylons.g = pylons.app_globals
-from pylons import c, g
+from pylons import tmpl_context as c, app_globals as g
from datadiff.tools import assert_equal
from nose.tools import assert_in
from ming.orm import FieldProperty, Mapper
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/Allura/allura/tests/tscript.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/tscript.py b/Allura/allura/tests/tscript.py
index 27cd5a9..a3712f1 100644
--- a/Allura/allura/tests/tscript.py
+++ b/Allura/allura/tests/tscript.py
@@ -2,7 +2,7 @@ import sys
import logging
from tg import config
-from pylons import c
+from pylons import tmpl_context as c
from allura import model as M
from allura.lib import helpers as h
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/Allura/allura/tests/unit/patches.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/unit/patches.py b/Allura/allura/tests/unit/patches.py
index ee60c34..d3bb4c1 100644
--- a/Allura/allura/tests/unit/patches.py
+++ b/Allura/allura/tests/unit/patches.py
@@ -1,5 +1,5 @@
from mock import Mock, patch
-from pylons import c
+from pylons import tmpl_context as c
from allura.tests.unit.factories import create_project, create_app_config
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/Allura/allura/tests/unit/test_helpers/test_set_context.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/unit/test_helpers/test_set_context.py b/Allura/allura/tests/unit/test_helpers/test_set_context.py
index 53fb4fa..13dd85c 100644
--- a/Allura/allura/tests/unit/test_helpers/test_set_context.py
+++ b/Allura/allura/tests/unit/test_helpers/test_set_context.py
@@ -1,5 +1,5 @@
from nose.tools import assert_raises
-from pylons import c
+from pylons import tmpl_context as c
from bson import ObjectId
from allura.lib.helpers import set_context
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/Allura/allura/websetup/bootstrap.py
----------------------------------------------------------------------
diff --git a/Allura/allura/websetup/bootstrap.py b/Allura/allura/websetup/bootstrap.py
index 9107f81..9614b99 100644
--- a/Allura/allura/websetup/bootstrap.py
+++ b/Allura/allura/websetup/bootstrap.py
@@ -8,7 +8,7 @@ from collections import defaultdict
from datetime import datetime
import tg
-from pylons import c, g
+from pylons import tmpl_context as c, app_globals as g
from paste.deploy.converters import asbool
from ming import Session, mim
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/Allura/docs/tutorials/wiki-tool.rst
----------------------------------------------------------------------
diff --git a/Allura/docs/tutorials/wiki-tool.rst b/Allura/docs/tutorials/wiki-tool.rst
index 3c65d26..529e1b0 100644
--- a/Allura/docs/tutorials/wiki-tool.rst
+++ b/Allura/docs/tutorials/wiki-tool.rst
@@ -52,7 +52,7 @@ setting the pylons context object `c` before your test. An example of this
technique follows::
import mock
- from pylons import c, g
+ from pylons import tmpl_context as c, app_globals as g
from allura.lib.app_globals import Globals
from allura import model as M
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/Allura/test-light.py
----------------------------------------------------------------------
diff --git a/Allura/test-light.py b/Allura/test-light.py
index 7db0b6b..90f9fcd 100644
--- a/Allura/test-light.py
+++ b/Allura/test-light.py
@@ -1,6 +1,6 @@
import sys
-from pylons import c
+from pylons import tmpl_context as c
from allura.lib import helpers as h
from allura.model.repo import CommitDoc, TreeDoc, TreesDoc, DiffInfoDoc
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/ForgeActivity/forgeactivity/widgets/follow.py
----------------------------------------------------------------------
diff --git a/ForgeActivity/forgeactivity/widgets/follow.py b/ForgeActivity/forgeactivity/widgets/follow.py
index 50f84b6..4a759dd 100644
--- a/ForgeActivity/forgeactivity/widgets/follow.py
+++ b/ForgeActivity/forgeactivity/widgets/follow.py
@@ -1,4 +1,4 @@
-from pylons import c
+from pylons import tmpl_context as c
from formencode import validators as fev
import ew as ew_core
import ew.jinja2_ew as ew
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/ForgeBlog/forgeblog/command/rssfeeds.py
----------------------------------------------------------------------
diff --git a/ForgeBlog/forgeblog/command/rssfeeds.py b/ForgeBlog/forgeblog/command/rssfeeds.py
index d4f6582..ce601ef 100644
--- a/ForgeBlog/forgeblog/command/rssfeeds.py
+++ b/ForgeBlog/forgeblog/command/rssfeeds.py
@@ -9,7 +9,7 @@ import base
from allura.command import base as allura_base
from ming.orm import session
-from pylons import c
+from pylons import tmpl_context as c
from allura import model as M
from forgeblog import model as BM
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/ForgeBlog/forgeblog/model/blog.py
----------------------------------------------------------------------
diff --git a/ForgeBlog/forgeblog/model/blog.py b/ForgeBlog/forgeblog/model/blog.py
index 0c7aec4..1348205 100644
--- a/ForgeBlog/forgeblog/model/blog.py
+++ b/ForgeBlog/forgeblog/model/blog.py
@@ -6,7 +6,7 @@ from random import randint
import pylons
pylons.c = pylons.tmpl_context
pylons.g = pylons.app_globals
-from pylons import c, g
+from pylons import tmpl_context as c, app_globals as g
from pymongo.errors import DuplicateKeyError
from ming import schema
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/ForgeBlog/forgeblog/tests/test_commands.py
----------------------------------------------------------------------
diff --git a/ForgeBlog/forgeblog/tests/test_commands.py b/ForgeBlog/forgeblog/tests/test_commands.py
index cf6b00b..094ab45 100644
--- a/ForgeBlog/forgeblog/tests/test_commands.py
+++ b/ForgeBlog/forgeblog/tests/test_commands.py
@@ -2,7 +2,7 @@ from datetime import datetime, timedelta
import pylons
pylons.c = pylons.tmpl_context
pylons.g = pylons.app_globals
-from pylons import c, g
+from pylons import tmpl_context as c, app_globals as g
from datadiff.tools import assert_equal
from IPython.testing.decorators import module_not_available, skipif
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/ForgeBlog/forgeblog/tests/test_roles.py
----------------------------------------------------------------------
diff --git a/ForgeBlog/forgeblog/tests/test_roles.py b/ForgeBlog/forgeblog/tests/test_roles.py
index 4394f59..9c1bf5f 100644
--- a/ForgeBlog/forgeblog/tests/test_roles.py
+++ b/ForgeBlog/forgeblog/tests/test_roles.py
@@ -1,4 +1,4 @@
-from pylons import c, g
+from pylons import tmpl_context as c, app_globals as g
from alluratest.controller import setup_basic_test, setup_global_objects
from allura import model as M
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/ForgeBlog/forgeblog/tests/unit/__init__.py
----------------------------------------------------------------------
diff --git a/ForgeBlog/forgeblog/tests/unit/__init__.py b/ForgeBlog/forgeblog/tests/unit/__init__.py
index bcc7cf0..4814c42 100644
--- a/ForgeBlog/forgeblog/tests/unit/__init__.py
+++ b/ForgeBlog/forgeblog/tests/unit/__init__.py
@@ -1,6 +1,6 @@
import pylons
pylons.c = pylons.tmpl_context
-from pylons import c
+from pylons import tmpl_context as c
from ming.orm.ormsession import ThreadLocalORMSession
from allura.websetup import bootstrap
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/ForgeBlog/forgeblog/tests/unit/test_blog_post.py
----------------------------------------------------------------------
diff --git a/ForgeBlog/forgeblog/tests/unit/test_blog_post.py b/ForgeBlog/forgeblog/tests/unit/test_blog_post.py
index 542da0e..7b5b9ab 100644
--- a/ForgeBlog/forgeblog/tests/unit/test_blog_post.py
+++ b/ForgeBlog/forgeblog/tests/unit/test_blog_post.py
@@ -1,6 +1,6 @@
from datetime import datetime
from nose.tools import assert_equal
-from pylons import c
+from pylons import tmpl_context as c
from forgeblog import model as M
from forgeblog.tests.unit import BlogTestWithModel
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/ForgeDiscussion/forgediscussion/controllers/forum.py
----------------------------------------------------------------------
diff --git a/ForgeDiscussion/forgediscussion/controllers/forum.py b/ForgeDiscussion/forgediscussion/controllers/forum.py
index 7a81fdd..983c3eb 100644
--- a/ForgeDiscussion/forgediscussion/controllers/forum.py
+++ b/ForgeDiscussion/forgediscussion/controllers/forum.py
@@ -3,7 +3,7 @@ import pymongo
from tg import expose, validate, redirect
from tg import request
-from pylons import g, c
+from pylons import tmpl_context as c, app_globals as g
from webob import exc
from formencode import validators
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/ForgeDiscussion/forgediscussion/import_support.py
----------------------------------------------------------------------
diff --git a/ForgeDiscussion/forgediscussion/import_support.py b/ForgeDiscussion/forgediscussion/import_support.py
index 6dafaf5..b99a620 100644
--- a/ForgeDiscussion/forgediscussion/import_support.py
+++ b/ForgeDiscussion/forgediscussion/import_support.py
@@ -5,7 +5,7 @@ from datetime import datetime
from ming import schema as S
from ming.orm import ThreadLocalORMSession, session
-from pylons import c
+from pylons import tmpl_context as c
from allura import model as M
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/ForgeDiscussion/forgediscussion/tasks.py
----------------------------------------------------------------------
diff --git a/ForgeDiscussion/forgediscussion/tasks.py b/ForgeDiscussion/forgediscussion/tasks.py
index b416439..e6b3946 100644
--- a/ForgeDiscussion/forgediscussion/tasks.py
+++ b/ForgeDiscussion/forgediscussion/tasks.py
@@ -1,6 +1,6 @@
import logging
-from pylons import c
+from pylons import tmpl_context as c
from allura.lib.decorators import task
log = logging.getLogger(__name__)
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/ForgeDiscussion/forgediscussion/tests/functional/test_forum.py
----------------------------------------------------------------------
diff --git a/ForgeDiscussion/forgediscussion/tests/functional/test_forum.py b/ForgeDiscussion/forgediscussion/tests/functional/test_forum.py
index ab1d34b..4f5e69f 100644
--- a/ForgeDiscussion/forgediscussion/tests/functional/test_forum.py
+++ b/ForgeDiscussion/forgediscussion/tests/functional/test_forum.py
@@ -10,7 +10,7 @@ import pkg_resources
import pylons
pylons.c = pylons.tmpl_context
pylons.g = pylons.app_globals
-from pylons import g, c
+from pylons import tmpl_context as c, app_globals as g
from nose.tools import assert_equal
from allura import model as M
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/ForgeDiscussion/forgediscussion/tests/functional/test_import.py
----------------------------------------------------------------------
diff --git a/ForgeDiscussion/forgediscussion/tests/functional/test_import.py b/ForgeDiscussion/forgediscussion/tests/functional/test_import.py
index 2e44202..723e58c 100644
--- a/ForgeDiscussion/forgediscussion/tests/functional/test_import.py
+++ b/ForgeDiscussion/forgediscussion/tests/functional/test_import.py
@@ -7,7 +7,7 @@ import ming
import pylons
pylons.c = pylons.tmpl_context
pylons.g = pylons.app_globals
-from pylons import g, c
+from pylons import tmpl_context as c, app_globals as g
from allura import model as M
from alluratest.controller import TestController, TestRestApiBase
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/ForgeDiscussion/forgediscussion/tests/test_forum_roles.py
----------------------------------------------------------------------
diff --git a/ForgeDiscussion/forgediscussion/tests/test_forum_roles.py b/ForgeDiscussion/forgediscussion/tests/test_forum_roles.py
index 2a4b6fe..b8f0895 100644
--- a/ForgeDiscussion/forgediscussion/tests/test_forum_roles.py
+++ b/ForgeDiscussion/forgediscussion/tests/test_forum_roles.py
@@ -1,4 +1,4 @@
-from pylons import c
+from pylons import tmpl_context as c
from alluratest.controller import setup_basic_test, setup_global_objects
from allura import model as M
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/ForgeDiscussion/forgediscussion/widgets/admin.py
----------------------------------------------------------------------
diff --git a/ForgeDiscussion/forgediscussion/widgets/admin.py b/ForgeDiscussion/forgediscussion/widgets/admin.py
index 688f00f..864dbb5 100644
--- a/ForgeDiscussion/forgediscussion/widgets/admin.py
+++ b/ForgeDiscussion/forgediscussion/widgets/admin.py
@@ -1,4 +1,4 @@
-from pylons import c
+from pylons import tmpl_context as c
from formencode import validators as fev
from formencode import All
import formencode
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/ForgeDiscussion/forgediscussion/widgets/forum_widgets.py
----------------------------------------------------------------------
diff --git a/ForgeDiscussion/forgediscussion/widgets/forum_widgets.py b/ForgeDiscussion/forgediscussion/widgets/forum_widgets.py
index 4ddab9f..1ca8537 100644
--- a/ForgeDiscussion/forgediscussion/widgets/forum_widgets.py
+++ b/ForgeDiscussion/forgediscussion/widgets/forum_widgets.py
@@ -1,4 +1,4 @@
-from pylons import c
+from pylons import tmpl_context as c
from formencode import validators as fev
import ew as ew_core
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/ForgeGit/forgegit/controllers.py
----------------------------------------------------------------------
diff --git a/ForgeGit/forgegit/controllers.py b/ForgeGit/forgegit/controllers.py
index 2829141..dfc3478 100644
--- a/ForgeGit/forgegit/controllers.py
+++ b/ForgeGit/forgegit/controllers.py
@@ -1,6 +1,6 @@
from tg import expose, redirect
from tg.decorators import with_trailing_slash
-from pylons import c
+from pylons import tmpl_context as c
from allura.controllers import repository
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/ForgeGit/forgegit/git_main.py
----------------------------------------------------------------------
diff --git a/ForgeGit/forgegit/git_main.py b/ForgeGit/forgegit/git_main.py
index 95bce77..a7efc11 100644
--- a/ForgeGit/forgegit/git_main.py
+++ b/ForgeGit/forgegit/git_main.py
@@ -2,7 +2,7 @@
import logging
# Non-stdlib imports
-from pylons import c
+from pylons import tmpl_context as c
from ming.utils import LazyProperty
from ming.orm.ormsession import ThreadLocalORMSession
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/ForgeGit/forgegit/tests/functional/test_controllers.py
----------------------------------------------------------------------
diff --git a/ForgeGit/forgegit/tests/functional/test_controllers.py b/ForgeGit/forgegit/tests/functional/test_controllers.py
index 61c3ad9..111cd6e 100644
--- a/ForgeGit/forgegit/tests/functional/test_controllers.py
+++ b/ForgeGit/forgegit/tests/functional/test_controllers.py
@@ -6,7 +6,7 @@ import pkg_resources
import pylons
pylons.c = pylons.tmpl_context
pylons.g = pylons.app_globals
-from pylons import c
+from pylons import tmpl_context as c
from ming.orm import ThreadLocalORMSession
from datadiff.tools import assert_equal
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/ForgeGit/forgegit/tests/model/test_repository.py
----------------------------------------------------------------------
diff --git a/ForgeGit/forgegit/tests/model/test_repository.py b/ForgeGit/forgegit/tests/model/test_repository.py
index b1a16f5..562f989 100644
--- a/ForgeGit/forgegit/tests/model/test_repository.py
+++ b/ForgeGit/forgegit/tests/model/test_repository.py
@@ -7,7 +7,7 @@ import mock
import pylons
pylons.c = pylons.tmpl_context
pylons.g = pylons.app_globals
-from pylons import c, g
+from pylons import tmpl_context as c, app_globals as g
from ming.base import Object
from ming.orm import ThreadLocalORMSession, session
from nose.tools import assert_equal
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/ForgeGit/forgegit/tests/test_git_app.py
----------------------------------------------------------------------
diff --git a/ForgeGit/forgegit/tests/test_git_app.py b/ForgeGit/forgegit/tests/test_git_app.py
index 8309420..7cf8d26 100644
--- a/ForgeGit/forgegit/tests/test_git_app.py
+++ b/ForgeGit/forgegit/tests/test_git_app.py
@@ -1,7 +1,7 @@
import unittest
from nose.tools import assert_equals
-from pylons import c
+from pylons import tmpl_context as c
from ming.orm import ThreadLocalORMSession
from alluratest.controller import setup_basic_test, setup_global_objects
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/ForgeGit/forgegit/tests/test_tasks.py
----------------------------------------------------------------------
diff --git a/ForgeGit/forgegit/tests/test_tasks.py b/ForgeGit/forgegit/tests/test_tasks.py
index 291fb0f..32796eb 100644
--- a/ForgeGit/forgegit/tests/test_tasks.py
+++ b/ForgeGit/forgegit/tests/test_tasks.py
@@ -2,7 +2,7 @@ import unittest
import mock
from ming.orm import ThreadLocalORMSession
-from pylons import c
+from pylons import tmpl_context as c
from alluratest.controller import setup_basic_test, setup_global_objects
from allura.lib import helpers as h
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/ForgeSVN/forgesvn/controllers.py
----------------------------------------------------------------------
diff --git a/ForgeSVN/forgesvn/controllers.py b/ForgeSVN/forgesvn/controllers.py
index af5a370..59748ec 100644
--- a/ForgeSVN/forgesvn/controllers.py
+++ b/ForgeSVN/forgesvn/controllers.py
@@ -1,6 +1,6 @@
from tg import expose, redirect
from tg.decorators import with_trailing_slash
-from pylons import c
+from pylons import tmpl_context as c
from allura.controllers import repository
from allura.lib import helpers as h
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/ForgeSVN/forgesvn/tests/functional/test_controllers.py
----------------------------------------------------------------------
diff --git a/ForgeSVN/forgesvn/tests/functional/test_controllers.py b/ForgeSVN/forgesvn/tests/functional/test_controllers.py
index 35bec2c..25f6eb4 100644
--- a/ForgeSVN/forgesvn/tests/functional/test_controllers.py
+++ b/ForgeSVN/forgesvn/tests/functional/test_controllers.py
@@ -4,7 +4,7 @@ import pkg_resources
import pylons
pylons.c = pylons.tmpl_context
pylons.g = pylons.app_globals
-from pylons import c
+from pylons import tmpl_context as c
from ming.orm import ThreadLocalORMSession
from allura.lib import helpers as h
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/ForgeSVN/forgesvn/tests/model/test_repository.py
----------------------------------------------------------------------
diff --git a/ForgeSVN/forgesvn/tests/model/test_repository.py b/ForgeSVN/forgesvn/tests/model/test_repository.py
index 9006271..2b6fab5 100644
--- a/ForgeSVN/forgesvn/tests/model/test_repository.py
+++ b/ForgeSVN/forgesvn/tests/model/test_repository.py
@@ -6,7 +6,7 @@ from itertools import count, product
from datetime import datetime
from collections import defaultdict
-from pylons import c
+from pylons import tmpl_context as c
import mock
from nose.tools import assert_equal
import tg
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/ForgeSVN/forgesvn/tests/test_svn_app.py
----------------------------------------------------------------------
diff --git a/ForgeSVN/forgesvn/tests/test_svn_app.py b/ForgeSVN/forgesvn/tests/test_svn_app.py
index 1d95039..e210250 100644
--- a/ForgeSVN/forgesvn/tests/test_svn_app.py
+++ b/ForgeSVN/forgesvn/tests/test_svn_app.py
@@ -1,7 +1,7 @@
import unittest
from nose.tools import assert_equals
-from pylons import c
+from pylons import tmpl_context as c
from ming.orm import ThreadLocalORMSession
from alluratest.controller import setup_basic_test, setup_global_objects
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/ForgeSVN/forgesvn/tests/test_tasks.py
----------------------------------------------------------------------
diff --git a/ForgeSVN/forgesvn/tests/test_tasks.py b/ForgeSVN/forgesvn/tests/test_tasks.py
index c3173a4..dd8a13f 100644
--- a/ForgeSVN/forgesvn/tests/test_tasks.py
+++ b/ForgeSVN/forgesvn/tests/test_tasks.py
@@ -4,7 +4,7 @@ import unittest
import tg
import mock
-from pylons import c
+from pylons import tmpl_context as c
from ming.orm import ThreadLocalORMSession
from paste.deploy.converters import asbool
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/ForgeShortUrl/forgeshorturl/main.py
----------------------------------------------------------------------
diff --git a/ForgeShortUrl/forgeshorturl/main.py b/ForgeShortUrl/forgeshorturl/main.py
index 6df4be9..4036a85 100644
--- a/ForgeShortUrl/forgeshorturl/main.py
+++ b/ForgeShortUrl/forgeshorturl/main.py
@@ -13,7 +13,7 @@ from allura.lib.widgets.search import SearchResults
from webob import exc
import pylons
-from pylons import c, g
+from pylons import tmpl_context as c, app_globals as g
from datetime import datetime
from formencode import validators
from formencode.compound import All
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/ForgeShortUrl/forgeshorturl/model/shorturl.py
----------------------------------------------------------------------
diff --git a/ForgeShortUrl/forgeshorturl/model/shorturl.py b/ForgeShortUrl/forgeshorturl/model/shorturl.py
index b86d499..b5c0ba6 100644
--- a/ForgeShortUrl/forgeshorturl/model/shorturl.py
+++ b/ForgeShortUrl/forgeshorturl/model/shorturl.py
@@ -1,7 +1,7 @@
import pymongo
import pylons
pylons.c = pylons.tmpl_context
-from pylons import c
+from pylons import tmpl_context as c
from ming.orm import FieldProperty, ForeignIdProperty, session
from datetime import datetime
from allura.model.auth import User
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/ForgeShortUrl/forgeshorturl/tests/functional/test.py
----------------------------------------------------------------------
diff --git a/ForgeShortUrl/forgeshorturl/tests/functional/test.py b/ForgeShortUrl/forgeshorturl/tests/functional/test.py
index 43380ca..75e044b 100644
--- a/ForgeShortUrl/forgeshorturl/tests/functional/test.py
+++ b/ForgeShortUrl/forgeshorturl/tests/functional/test.py
@@ -1,6 +1,6 @@
import pylons
pylons.c = pylons.tmpl_context
-from pylons import c
+from pylons import tmpl_context as c
from allura.tests import decorators as td
from alluratest.controller import TestController
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/ForgeTracker/forgetracker/import_support.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/import_support.py b/ForgeTracker/forgetracker/import_support.py
index 4e587fb..f3b4a91 100644
--- a/ForgeTracker/forgetracker/import_support.py
+++ b/ForgeTracker/forgetracker/import_support.py
@@ -5,7 +5,7 @@ from datetime import datetime
from cStringIO import StringIO
# Non-stdlib imports
-from pylons import c
+from pylons import tmpl_context as c
from ming.orm.ormsession import ThreadLocalORMSession
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/ForgeTracker/forgetracker/model/ticket.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/model/ticket.py b/ForgeTracker/forgetracker/model/ticket.py
index ada1cae..81782a7 100644
--- a/ForgeTracker/forgetracker/model/ticket.py
+++ b/ForgeTracker/forgetracker/model/ticket.py
@@ -9,7 +9,7 @@ import pylons
pylons.c = pylons.tmpl_context
pylons.g = pylons.app_globals
from pymongo.errors import OperationFailure
-from pylons import c, g
+from pylons import tmpl_context as c, app_globals as g
from ming import schema
from ming.utils import LazyProperty
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/ForgeTracker/forgetracker/tasks.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/tasks.py b/ForgeTracker/forgetracker/tasks.py
index 3e88aae..08a7183 100644
--- a/ForgeTracker/forgetracker/tasks.py
+++ b/ForgeTracker/forgetracker/tasks.py
@@ -1,6 +1,6 @@
import logging
-from pylons import c
+from pylons import tmpl_context as c
from allura.lib.decorators import task
from allura.lib import helpers as h
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/ForgeTracker/forgetracker/tests/functional/test_import.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/tests/functional/test_import.py b/ForgeTracker/forgetracker/tests/functional/test_import.py
index 3dd0576..9778aa0 100644
--- a/ForgeTracker/forgetracker/tests/functional/test_import.py
+++ b/ForgeTracker/forgetracker/tests/functional/test_import.py
@@ -7,7 +7,7 @@ import ming
import pylons
pylons.c = pylons.tmpl_context
pylons.g = pylons.app_globals
-from pylons import g
+from pylons import app_globals as g
from allura import model as M
from alluratest.controller import TestRestApiBase
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/ForgeTracker/forgetracker/tests/functional/test_rest.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/tests/functional/test_rest.py b/ForgeTracker/forgetracker/tests/functional/test_rest.py
index 0c5ae3e..53b0d7d 100644
--- a/ForgeTracker/forgetracker/tests/functional/test_rest.py
+++ b/ForgeTracker/forgetracker/tests/functional/test_rest.py
@@ -1,7 +1,7 @@
import pylons
pylons.c = pylons.tmpl_context
pylons.g = pylons.app_globals
-from pylons import c
+from pylons import tmpl_context as c
from datadiff.tools import assert_equal
from mock import patch
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/ForgeTracker/forgetracker/tests/test_tracker_roles.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/tests/test_tracker_roles.py b/ForgeTracker/forgetracker/tests/test_tracker_roles.py
index 1b4dcce..4d041bc 100644
--- a/ForgeTracker/forgetracker/tests/test_tracker_roles.py
+++ b/ForgeTracker/forgetracker/tests/test_tracker_roles.py
@@ -1,4 +1,4 @@
-from pylons import c, g
+from pylons import tmpl_context as c, app_globals as g
from alluratest.controller import setup_basic_test, setup_global_objects
from allura import model as M
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/ForgeTracker/forgetracker/tests/unit/__init__.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/tests/unit/__init__.py b/ForgeTracker/forgetracker/tests/unit/__init__.py
index 990a62c..17fe7d2 100644
--- a/ForgeTracker/forgetracker/tests/unit/__init__.py
+++ b/ForgeTracker/forgetracker/tests/unit/__init__.py
@@ -1,7 +1,7 @@
import pylons
pylons.c = pylons.tmpl_context
pylons.g = pylons.app_globals
-from pylons import c
+from pylons import tmpl_context as c
from ming.orm.ormsession import ThreadLocalORMSession
from allura.websetup import bootstrap
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/ForgeTracker/forgetracker/tests/unit/test_globals_model.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/tests/unit/test_globals_model.py b/ForgeTracker/forgetracker/tests/unit/test_globals_model.py
index b713265..f87aca2 100644
--- a/ForgeTracker/forgetracker/tests/unit/test_globals_model.py
+++ b/ForgeTracker/forgetracker/tests/unit/test_globals_model.py
@@ -5,7 +5,7 @@ from datetime import datetime, timedelta
import forgetracker
from forgetracker.model import Globals
from forgetracker.tests.unit import TrackerTestWithModel
-from pylons import c
+from pylons import tmpl_context as c
from allura.lib import helpers as h
from ming.orm.ormsession import ThreadLocalORMSession
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/ForgeTracker/forgetracker/tests/unit/test_milestone_controller.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/tests/unit/test_milestone_controller.py b/ForgeTracker/forgetracker/tests/unit/test_milestone_controller.py
index e49b21d..fa94d7e 100644
--- a/ForgeTracker/forgetracker/tests/unit/test_milestone_controller.py
+++ b/ForgeTracker/forgetracker/tests/unit/test_milestone_controller.py
@@ -6,7 +6,7 @@ from nose.tools import assert_equal
from allura.lib import helpers as h
from allura.model import User
-from pylons import c
+from pylons import tmpl_context as c
from forgetracker.tests.unit import TrackerTestWithModel
from forgetracker.model import Ticket, Globals
from forgetracker.tracker_main import MilestoneController
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/ForgeTracker/forgetracker/tests/unit/test_root_controller.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/tests/unit/test_root_controller.py b/ForgeTracker/forgetracker/tests/unit/test_root_controller.py
index 695cada..a1024ea 100644
--- a/ForgeTracker/forgetracker/tests/unit/test_root_controller.py
+++ b/ForgeTracker/forgetracker/tests/unit/test_root_controller.py
@@ -3,7 +3,7 @@ from ming.orm.ormsession import session
from allura.lib import helpers as h
from allura.model import User
-from pylons import c
+from pylons import tmpl_context as c
from forgetracker.tests.unit import TrackerTestWithModel
from forgetracker.model import Ticket, Globals
from forgetracker import tracker_main
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/ForgeTracker/forgetracker/tests/unit/test_ticket_custom_fields_form.py
----------------------------------------------------------------------
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 da72591..458a016 100644
--- a/ForgeTracker/forgetracker/tests/unit/test_ticket_custom_fields_form.py
+++ b/ForgeTracker/forgetracker/tests/unit/test_ticket_custom_fields_form.py
@@ -1,7 +1,7 @@
from ming.orm.ormsession import ThreadLocalORMSession
from ming.base import Object
-from pylons import c
+from pylons import tmpl_context as c
from forgetracker.tests.unit import TrackerTestWithModel
from forgetracker.widgets import ticket_form
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/ForgeTracker/forgetracker/tests/unit/test_ticket_form.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/tests/unit/test_ticket_form.py b/ForgeTracker/forgetracker/tests/unit/test_ticket_form.py
index c576b78..598bf0c 100644
--- a/ForgeTracker/forgetracker/tests/unit/test_ticket_form.py
+++ b/ForgeTracker/forgetracker/tests/unit/test_ticket_form.py
@@ -1,7 +1,7 @@
from mock import patch
from ming.orm.ormsession import ThreadLocalORMSession
-from pylons import c
+from pylons import tmpl_context as c
from forgetracker.tests.unit import TrackerTestWithModel
from forgetracker.widgets import ticket_form
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/ForgeTracker/forgetracker/tests/unit/test_ticket_model.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/tests/unit/test_ticket_model.py b/ForgeTracker/forgetracker/tests/unit/test_ticket_model.py
index dc2647e..6934179 100644
--- a/ForgeTracker/forgetracker/tests/unit/test_ticket_model.py
+++ b/ForgeTracker/forgetracker/tests/unit/test_ticket_model.py
@@ -1,4 +1,4 @@
-from pylons import c
+from pylons import tmpl_context as c
from datetime import datetime
from ming.orm.ormsession import ThreadLocalORMSession
@@ -58,7 +58,7 @@ class TestTicketModel(TrackerTestWithModel):
raise AssertionError('Expected schema.Invalid to be thrown')
def test_private_ticket(self):
- from pylons import c
+ from pylons import tmpl_context as c
from allura.model import ProjectRole, User
from allura.model import ACE, ALL_PERMISSIONS, DENY_ALL
from allura.lib.security import Credentials, has_access
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/ForgeTracker/forgetracker/widgets/admin_custom_fields.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/widgets/admin_custom_fields.py b/ForgeTracker/forgetracker/widgets/admin_custom_fields.py
index 615677c..7a376ca 100644
--- a/ForgeTracker/forgetracker/widgets/admin_custom_fields.py
+++ b/ForgeTracker/forgetracker/widgets/admin_custom_fields.py
@@ -4,7 +4,7 @@ import ew.jinja2_ew as ew
from allura.lib.widgets import form_fields as ffw
from allura.lib.widgets import forms as f
-from pylons import c
+from pylons import tmpl_context as c
from forgetracker import model
from formencode import validators as fev
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/ForgeTracker/forgetracker/widgets/ticket_form.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/widgets/ticket_form.py b/ForgeTracker/forgetracker/widgets/ticket_form.py
index 13dfd5d..4ec551b 100644
--- a/ForgeTracker/forgetracker/widgets/ticket_form.py
+++ b/ForgeTracker/forgetracker/widgets/ticket_form.py
@@ -1,6 +1,6 @@
from allura.lib.widgets import form_fields as ffw
-from pylons import c
+from pylons import tmpl_context as c
from formencode import validators as fev
import ew as ew_core
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/ForgeTracker/forgetracker/widgets/ticket_search.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/widgets/ticket_search.py b/ForgeTracker/forgetracker/widgets/ticket_search.py
index a0de204..db56ecd 100644
--- a/ForgeTracker/forgetracker/widgets/ticket_search.py
+++ b/ForgeTracker/forgetracker/widgets/ticket_search.py
@@ -1,6 +1,6 @@
import tg
-from pylons import c
+from pylons import tmpl_context as c
import ew as ew_core
import ew.jinja2_ew as ew
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/ForgeWiki/forgewiki/command/wiki2markdown/loaders.py
----------------------------------------------------------------------
diff --git a/ForgeWiki/forgewiki/command/wiki2markdown/loaders.py b/ForgeWiki/forgewiki/command/wiki2markdown/loaders.py
index 88e8d55..d7a3ce4 100644
--- a/ForgeWiki/forgewiki/command/wiki2markdown/loaders.py
+++ b/ForgeWiki/forgewiki/command/wiki2markdown/loaders.py
@@ -1,7 +1,7 @@
import os
import json
import datetime
-from pylons import c
+from pylons import tmpl_context as c
from ming.orm.ormsession import ThreadLocalORMSession
from allura import model as M
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/ForgeWiki/forgewiki/tests/test_wiki_roles.py
----------------------------------------------------------------------
diff --git a/ForgeWiki/forgewiki/tests/test_wiki_roles.py b/ForgeWiki/forgewiki/tests/test_wiki_roles.py
index f33ea0a..649abfb 100644
--- a/ForgeWiki/forgewiki/tests/test_wiki_roles.py
+++ b/ForgeWiki/forgewiki/tests/test_wiki_roles.py
@@ -1,4 +1,4 @@
-from pylons import c, g
+from pylons import tmpl_context as c, app_globals as g
from nose.tools import assert_equal
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/scripts/create-allura-sitemap.py
----------------------------------------------------------------------
diff --git a/scripts/create-allura-sitemap.py b/scripts/create-allura-sitemap.py
index c316b14..e3c4568 100644
--- a/scripts/create-allura-sitemap.py
+++ b/scripts/create-allura-sitemap.py
@@ -16,7 +16,7 @@ from datetime import datetime
from jinja2 import Template
import pylons, webob
-from pylons import c
+from pylons import tmpl_context as c
from allura import model as M
from allura.lib import security, utils
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/scripts/migrate_project_database.py
----------------------------------------------------------------------
diff --git a/scripts/migrate_project_database.py b/scripts/migrate_project_database.py
index b5f5140..a0cf744 100644
--- a/scripts/migrate_project_database.py
+++ b/scripts/migrate_project_database.py
@@ -3,7 +3,7 @@ import sys
import shutil
import logging
-from pylons import c
+from pylons import tmpl_context as c
from ming.orm import session
from allura import model as M
log = logging.getLogger(__name__)
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/scripts/migrations/000-fix-tracker-fields.py
----------------------------------------------------------------------
diff --git a/scripts/migrations/000-fix-tracker-fields.py b/scripts/migrations/000-fix-tracker-fields.py
index 7d0b749..3e87510 100644
--- a/scripts/migrations/000-fix-tracker-fields.py
+++ b/scripts/migrations/000-fix-tracker-fields.py
@@ -2,7 +2,7 @@ import sys
import json
import logging
-from pylons import c
+from pylons import tmpl_context as c
from ming.orm import session, MappedClass
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/scripts/migrations/001-restore-labels.py
----------------------------------------------------------------------
diff --git a/scripts/migrations/001-restore-labels.py b/scripts/migrations/001-restore-labels.py
index 3585481..e57e83a 100644
--- a/scripts/migrations/001-restore-labels.py
+++ b/scripts/migrations/001-restore-labels.py
@@ -2,7 +2,7 @@ import sys
import json
import logging
-from pylons import c
+from pylons import tmpl_context as c
from ming.orm import session, MappedClass
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/scripts/migrations/002-fix-tracker-thread-subjects.py
----------------------------------------------------------------------
diff --git a/scripts/migrations/002-fix-tracker-thread-subjects.py b/scripts/migrations/002-fix-tracker-thread-subjects.py
index cdf25a1..382bf38 100644
--- a/scripts/migrations/002-fix-tracker-thread-subjects.py
+++ b/scripts/migrations/002-fix-tracker-thread-subjects.py
@@ -1,7 +1,7 @@
import sys
import logging
-from pylons import c
+from pylons import tmpl_context as c
from ming.orm import session
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/scripts/migrations/003-migrate_project_roles.py
----------------------------------------------------------------------
diff --git a/scripts/migrations/003-migrate_project_roles.py b/scripts/migrations/003-migrate_project_roles.py
index 7a7dbd0..f04e03f 100644
--- a/scripts/migrations/003-migrate_project_roles.py
+++ b/scripts/migrations/003-migrate_project_roles.py
@@ -3,7 +3,7 @@ central ProjectRole collection.
'''
import logging
-from pylons import c
+from pylons import tmpl_context as c
from ming.orm import session, state
from allura import model as M
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/scripts/migrations/004-make-attachments-polymorphic.py
----------------------------------------------------------------------
diff --git a/scripts/migrations/004-make-attachments-polymorphic.py b/scripts/migrations/004-make-attachments-polymorphic.py
index 62785d6..60f2ccf 100644
--- a/scripts/migrations/004-make-attachments-polymorphic.py
+++ b/scripts/migrations/004-make-attachments-polymorphic.py
@@ -1,6 +1,6 @@
import logging
-from pylons import c
+from pylons import tmpl_context as c
from ming.orm import ThreadLocalORMSession
from allura import model as M
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/scripts/migrations/006-migrate-artifact-refs.py
----------------------------------------------------------------------
diff --git a/scripts/migrations/006-migrate-artifact-refs.py b/scripts/migrations/006-migrate-artifact-refs.py
index 1cca70c..2ad46a6 100644
--- a/scripts/migrations/006-migrate-artifact-refs.py
+++ b/scripts/migrations/006-migrate-artifact-refs.py
@@ -2,7 +2,7 @@ import sys
import logging
from cPickle import loads
-from pylons import c
+from pylons import tmpl_context as c
from allura import model as M
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/scripts/migrations/007-update-acls.py
----------------------------------------------------------------------
diff --git a/scripts/migrations/007-update-acls.py b/scripts/migrations/007-update-acls.py
index 84116d8..a1acc45 100644
--- a/scripts/migrations/007-update-acls.py
+++ b/scripts/migrations/007-update-acls.py
@@ -3,7 +3,7 @@ from optparse import OptionParser
from pprint import pformat
import bson
-from pylons import c
+from pylons import tmpl_context as c
from ming.base import Object
from allura import model as M
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/scripts/migrations/010-fix-home-permissions.py
----------------------------------------------------------------------
diff --git a/scripts/migrations/010-fix-home-permissions.py b/scripts/migrations/010-fix-home-permissions.py
index f66e76a..5983863 100644
--- a/scripts/migrations/010-fix-home-permissions.py
+++ b/scripts/migrations/010-fix-home-permissions.py
@@ -2,7 +2,7 @@ import sys
import logging
from collections import OrderedDict
-from pylons import c
+from pylons import tmpl_context as c
from ming.orm import session
from bson import ObjectId
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/scripts/migrations/012-uninstall-home.py
----------------------------------------------------------------------
diff --git a/scripts/migrations/012-uninstall-home.py b/scripts/migrations/012-uninstall-home.py
index a8b66f5..bf73d33 100644
--- a/scripts/migrations/012-uninstall-home.py
+++ b/scripts/migrations/012-uninstall-home.py
@@ -1,7 +1,7 @@
import sys
import logging
-from pylons import c
+from pylons import tmpl_context as c
from ming.orm import session
from bson import ObjectId
from mock import Mock, patch
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/scripts/migrations/013-update-ordinals.py
----------------------------------------------------------------------
diff --git a/scripts/migrations/013-update-ordinals.py b/scripts/migrations/013-update-ordinals.py
index 952281f..0bc7f94 100644
--- a/scripts/migrations/013-update-ordinals.py
+++ b/scripts/migrations/013-update-ordinals.py
@@ -1,7 +1,7 @@
import sys
import logging
-from pylons import c
+from pylons import tmpl_context as c
from ming.orm import session
from ming.orm.ormsession import ThreadLocalORMSession
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/scripts/migrations/014-add-trove-category-agpl.py
----------------------------------------------------------------------
diff --git a/scripts/migrations/014-add-trove-category-agpl.py b/scripts/migrations/014-add-trove-category-agpl.py
index c315c40..f54ecd4 100644
--- a/scripts/migrations/014-add-trove-category-agpl.py
+++ b/scripts/migrations/014-add-trove-category-agpl.py
@@ -1,7 +1,7 @@
import sys
import logging
-from pylons import c
+from pylons import tmpl_context as c
from ming.orm import session
from ming.orm.ormsession import ThreadLocalORMSession
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/scripts/migrations/015-add-neighborhood_id-to-blog-posts.py
----------------------------------------------------------------------
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 8d05801..3dd475d 100644
--- a/scripts/migrations/015-add-neighborhood_id-to-blog-posts.py
+++ b/scripts/migrations/015-add-neighborhood_id-to-blog-posts.py
@@ -1,7 +1,7 @@
import sys
import logging
-from pylons import c
+from pylons import tmpl_context as c
from ming.orm import session
from ming.orm.ormsession import ThreadLocalORMSession
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/scripts/migrations/016-add-trove-category-lppl.py
----------------------------------------------------------------------
diff --git a/scripts/migrations/016-add-trove-category-lppl.py b/scripts/migrations/016-add-trove-category-lppl.py
index 9f73418..800803f 100644
--- a/scripts/migrations/016-add-trove-category-lppl.py
+++ b/scripts/migrations/016-add-trove-category-lppl.py
@@ -1,7 +1,7 @@
import sys
import logging
-from pylons import c
+from pylons import tmpl_context as c
from ming.orm import session
from ming.orm.ormsession import ThreadLocalORMSession
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/scripts/migrations/017-sync-trove-categories.py
----------------------------------------------------------------------
diff --git a/scripts/migrations/017-sync-trove-categories.py b/scripts/migrations/017-sync-trove-categories.py
index f491318..b5b5bfb 100644
--- a/scripts/migrations/017-sync-trove-categories.py
+++ b/scripts/migrations/017-sync-trove-categories.py
@@ -1,7 +1,7 @@
import sys
import logging
-from pylons import c
+from pylons import tmpl_context as c
from ming.orm import session
from ming.orm.ormsession import ThreadLocalORMSession
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/scripts/migrations/020-remove-wiki-title-slashes.py
----------------------------------------------------------------------
diff --git a/scripts/migrations/020-remove-wiki-title-slashes.py b/scripts/migrations/020-remove-wiki-title-slashes.py
index 826365e..b5cebc4 100644
--- a/scripts/migrations/020-remove-wiki-title-slashes.py
+++ b/scripts/migrations/020-remove-wiki-title-slashes.py
@@ -1,6 +1,6 @@
import logging
-from pylons import c
+from pylons import tmpl_context as c
from ming.orm import ThreadLocalORMSession
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/scripts/migrations/024-migrate-custom-profile-text.py
----------------------------------------------------------------------
diff --git a/scripts/migrations/024-migrate-custom-profile-text.py b/scripts/migrations/024-migrate-custom-profile-text.py
index 64f1622..8a6804c 100644
--- a/scripts/migrations/024-migrate-custom-profile-text.py
+++ b/scripts/migrations/024-migrate-custom-profile-text.py
@@ -1,7 +1,7 @@
import logging
import re
-from pylons import c
+from pylons import tmpl_context as c
from ming.orm import ThreadLocalORMSession
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/scripts/migrations/025-add-is-nbhd-project.py
----------------------------------------------------------------------
diff --git a/scripts/migrations/025-add-is-nbhd-project.py b/scripts/migrations/025-add-is-nbhd-project.py
index be85736..6b55faf 100644
--- a/scripts/migrations/025-add-is-nbhd-project.py
+++ b/scripts/migrations/025-add-is-nbhd-project.py
@@ -1,7 +1,7 @@
import logging
import re
-from pylons import c
+from pylons import tmpl_context as c
from ming.orm import ThreadLocalORMSession, session
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/scripts/migrations/027-change-ticket-write-permissions.py
----------------------------------------------------------------------
diff --git a/scripts/migrations/027-change-ticket-write-permissions.py b/scripts/migrations/027-change-ticket-write-permissions.py
index 41e7784..5ba5b23 100644
--- a/scripts/migrations/027-change-ticket-write-permissions.py
+++ b/scripts/migrations/027-change-ticket-write-permissions.py
@@ -1,7 +1,7 @@
import logging
import re
-from pylons import c
+from pylons import tmpl_context as c
from ming.orm import ThreadLocalORMSession
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/scripts/project-import.py
----------------------------------------------------------------------
diff --git a/scripts/project-import.py b/scripts/project-import.py
index b7cd686..578e064 100644
--- a/scripts/project-import.py
+++ b/scripts/project-import.py
@@ -10,7 +10,7 @@ import sys
import colander as col
from ming.orm import session, ThreadLocalORMSession
-from pylons import c, g
+from pylons import tmpl_context as c, app_globals as g
from tg import config
from allura import model as M
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/scripts/publicize-neighborhood.py
----------------------------------------------------------------------
diff --git a/scripts/publicize-neighborhood.py b/scripts/publicize-neighborhood.py
index d565c96..df0b35b 100644
--- a/scripts/publicize-neighborhood.py
+++ b/scripts/publicize-neighborhood.py
@@ -2,7 +2,7 @@ import logging
import sys
from ming.orm import ThreadLocalORMSession
-from pylons import c, g
+from pylons import tmpl_context as c, app_globals as g
from allura import model as M
from allura.lib import helpers as h
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/scripts/refresh-last-commits.py
----------------------------------------------------------------------
diff --git a/scripts/refresh-last-commits.py b/scripts/refresh-last-commits.py
index e3b643f..858f335 100644
--- a/scripts/refresh-last-commits.py
+++ b/scripts/refresh-last-commits.py
@@ -7,7 +7,7 @@ from datetime import datetime
from contextlib import contextmanager
import faulthandler
-from pylons import c
+from pylons import tmpl_context as c
from ming.orm import ThreadLocalORMSession, session
from allura import model as M
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/scripts/rethumb.py
----------------------------------------------------------------------
diff --git a/scripts/rethumb.py b/scripts/rethumb.py
index 90e1e67..9a0156f 100644
--- a/scripts/rethumb.py
+++ b/scripts/rethumb.py
@@ -4,7 +4,7 @@ import time
import pkg_resources
import Image
import tg
-from pylons import c
+from pylons import tmpl_context as c
from paste.deploy.converters import asint
from ming.orm import mapper, ThreadLocalORMSession, session, state, Mapper
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/scripts/scrub-allura-data.py
----------------------------------------------------------------------
diff --git a/scripts/scrub-allura-data.py b/scripts/scrub-allura-data.py
index 80bf892..dca6fdc 100644
--- a/scripts/scrub-allura-data.py
+++ b/scripts/scrub-allura-data.py
@@ -3,7 +3,7 @@ import sys
from ming.orm import ThreadLocalORMSession
import mock
-from pylons import c, g
+from pylons import tmpl_context as c, app_globals as g
from allura import model as M
from forgediscussion import model as DM
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/47f0f7e9/scripts/teamforge-import.py
----------------------------------------------------------------------
diff --git a/scripts/teamforge-import.py b/scripts/teamforge-import.py
index 49294f8..f54d526 100644
--- a/scripts/teamforge-import.py
+++ b/scripts/teamforge-import.py
@@ -1,7 +1,7 @@
import logging
from getpass import getpass
from optparse import OptionParser
-from pylons import c
+from pylons import tmpl_context as c
import re
import os
from time import mktime