You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by tv...@apache.org on 2013/02/25 22:56:18 UTC
[8/50] [abbrv] git commit: [#5837] fix more complex imports of
pylons.c|g
[#5837] fix more complex imports of 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/588145a7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/588145a7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/588145a7
Branch: refs/heads/si/5453
Commit: 588145a723e2344f95deebcd515f96098885bd4f
Parents: bea16d6
Author: Dave Brondsema <db...@geek.net>
Authored: Tue Feb 19 03:38:17 2013 +0000
Committer: Cory Johns <jo...@geek.net>
Committed: Tue Feb 19 23:26:58 2013 +0000
----------------------------------------------------------------------
Allura/allura/controllers/auth.py | 3 ++-
.../controllers/basetest_neighborhood_root.py | 3 ++-
Allura/allura/controllers/basetest_project_root.py | 3 ++-
Allura/allura/controllers/repository.py | 3 ++-
Allura/allura/controllers/rest.py | 3 ++-
Allura/allura/controllers/root.py | 3 ++-
Allura/allura/controllers/site_admin.py | 3 ++-
Allura/allura/controllers/trovecategories.py | 3 ++-
Allura/allura/ext/admin/admin_main.py | 3 ++-
Allura/allura/ext/user_profile/user_main.py | 3 ++-
Allura/allura/lib/helpers.py | 3 ++-
Allura/allura/lib/macro.py | 3 ++-
Allura/allura/lib/oid_helper.py | 3 ++-
Allura/allura/lib/security.py | 3 ++-
Allura/allura/model/artifact.py | 3 ++-
Allura/allura/model/auth.py | 3 ++-
Allura/allura/model/neighborhood.py | 6 ++----
Allura/allura/model/project.py | 3 ++-
Allura/allura/tests/model/test_discussion.py | 3 ++-
Allura/allura/tests/model/test_openid.py | 3 ++-
AlluraTesting/alluratest/controller.py | 3 ++-
AlluraTesting/alluratest/validation.py | 3 ++-
ForgeActivity/forgeactivity/main.py | 3 ++-
ForgeBlog/forgeblog/main.py | 3 ++-
ForgeChat/forgechat/main.py | 3 ++-
.../forgediscussion/controllers/root.py | 3 ++-
ForgeDiscussion/forgediscussion/forum_main.py | 3 ++-
ForgeLink/forgelink/link_main.py | 3 ++-
ForgeSVN/forgesvn/svn_main.py | 3 ++-
ForgeTracker/forgetracker/tracker_main.py | 3 ++-
ForgeWiki/forgewiki/model/wiki.py | 7 ++-----
ForgeWiki/forgewiki/tests/test_wiki2markdown.py | 4 +---
ForgeWiki/forgewiki/wiki_main.py | 3 ++-
33 files changed, 65 insertions(+), 42 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/588145a7/Allura/allura/controllers/auth.py
----------------------------------------------------------------------
diff --git a/Allura/allura/controllers/auth.py b/Allura/allura/controllers/auth.py
index 877ea4d..8b0be12 100644
--- a/Allura/allura/controllers/auth.py
+++ b/Allura/allura/controllers/auth.py
@@ -4,7 +4,8 @@ from urllib import urlencode
import bson
from tg import expose, session, flash, redirect, validate, config
from tg.decorators import with_trailing_slash
-from pylons import c, g, request, response
+from pylons import tmpl_context as c, app_globals as g
+from pylons import request, response
from webob import exc as wexc
import allura.tasks.repo_tasks
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/588145a7/Allura/allura/controllers/basetest_neighborhood_root.py
----------------------------------------------------------------------
diff --git a/Allura/allura/controllers/basetest_neighborhood_root.py b/Allura/allura/controllers/basetest_neighborhood_root.py
index 4eee52a..a5cc932 100644
--- a/Allura/allura/controllers/basetest_neighborhood_root.py
+++ b/Allura/allura/controllers/basetest_neighborhood_root.py
@@ -5,7 +5,8 @@ import logging
from urllib import unquote
import pkg_resources
-from pylons import c, g, request, response
+from pylons import tmpl_context as c, app_globals as g
+from pylons import request, response
from webob import exc
from tg import expose, redirect
from tg.decorators import without_trailing_slash
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/588145a7/Allura/allura/controllers/basetest_project_root.py
----------------------------------------------------------------------
diff --git a/Allura/allura/controllers/basetest_project_root.py b/Allura/allura/controllers/basetest_project_root.py
index 2c25f5f..5626019 100644
--- a/Allura/allura/controllers/basetest_project_root.py
+++ b/Allura/allura/controllers/basetest_project_root.py
@@ -5,7 +5,8 @@ import logging
from urllib import unquote
import pkg_resources
-from pylons import c, request, response
+from pylons import tmpl_context as c
+from pylons import request, response
from webob import exc
from tg import expose
from tg.decorators import without_trailing_slash
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/588145a7/Allura/allura/controllers/repository.py
----------------------------------------------------------------------
diff --git a/Allura/allura/controllers/repository.py b/Allura/allura/controllers/repository.py
index cf9aaf6..f543c6a 100644
--- a/Allura/allura/controllers/repository.py
+++ b/Allura/allura/controllers/repository.py
@@ -6,7 +6,8 @@ import difflib
from urllib import quote, unquote
from collections import defaultdict
-from pylons import c, g, request, response
+from pylons import tmpl_context as c, app_globals as g
+from pylons import request, response
from webob import exc
import tg
from tg import redirect, expose, flash, url, validate
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/588145a7/Allura/allura/controllers/rest.py
----------------------------------------------------------------------
diff --git a/Allura/allura/controllers/rest.py b/Allura/allura/controllers/rest.py
index 34a30a6..50f8ba6 100644
--- a/Allura/allura/controllers/rest.py
+++ b/Allura/allura/controllers/rest.py
@@ -5,7 +5,8 @@ import logging
import oauth2 as oauth
from webob import exc
from tg import expose, flash, redirect
-from pylons import c, request
+from pylons import tmpl_context as c
+from pylons import request
from ming.orm import session
from ming.utils import LazyProperty
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/588145a7/Allura/allura/controllers/root.py
----------------------------------------------------------------------
diff --git a/Allura/allura/controllers/root.py b/Allura/allura/controllers/root.py
index 2075a55..69c80ec 100644
--- a/Allura/allura/controllers/root.py
+++ b/Allura/allura/controllers/root.py
@@ -8,7 +8,8 @@ import pkg_resources
from tg import expose, flash, redirect, session, config, response, request, config
from tg.decorators import with_trailing_slash, without_trailing_slash
from tg.flash import TGFlash
-from pylons import c, g, cache
+from pylons import tmpl_context as c, app_globals as g
+from pylons import cache
import ew
import ming
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/588145a7/Allura/allura/controllers/site_admin.py
----------------------------------------------------------------------
diff --git a/Allura/allura/controllers/site_admin.py b/Allura/allura/controllers/site_admin.py
index 63e247e..a4d5f64 100644
--- a/Allura/allura/controllers/site_admin.py
+++ b/Allura/allura/controllers/site_admin.py
@@ -9,7 +9,8 @@ from ming.orm import session
import pymongo
import bson
import tg
-from pylons import c, g, request
+from pylons import tmpl_context as c, app_globals as g
+from pylons import request
from formencode import validators
from allura.lib import helpers as h
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/588145a7/Allura/allura/controllers/trovecategories.py
----------------------------------------------------------------------
diff --git a/Allura/allura/controllers/trovecategories.py b/Allura/allura/controllers/trovecategories.py
index 773e506..77cffd5 100644
--- a/Allura/allura/controllers/trovecategories.py
+++ b/Allura/allura/controllers/trovecategories.py
@@ -4,7 +4,8 @@ from urllib import urlencode
import bson
from tg import expose, session, flash, redirect, validate, config
from tg.decorators import with_trailing_slash
-from pylons import c, g, request, response
+from pylons import tmpl_context as c, app_globals as g
+from pylons import request, response
from string import digits, lowercase
from allura.lib.security import require_authenticated
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/588145a7/Allura/allura/ext/admin/admin_main.py
----------------------------------------------------------------------
diff --git a/Allura/allura/ext/admin/admin_main.py b/Allura/allura/ext/admin/admin_main.py
index 837d09e..3410637 100644
--- a/Allura/allura/ext/admin/admin_main.py
+++ b/Allura/allura/ext/admin/admin_main.py
@@ -4,7 +4,8 @@ from datetime import datetime
from urlparse import urlparse
import pkg_resources
-from pylons import c, g, request
+from pylons import tmpl_context as c, app_globals as g
+from pylons import request
from paste.deploy.converters import asbool
from tg import expose, redirect, flash, validate, config
from tg.decorators import with_trailing_slash, without_trailing_slash
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/588145a7/Allura/allura/ext/user_profile/user_main.py
----------------------------------------------------------------------
diff --git a/Allura/allura/ext/user_profile/user_main.py b/Allura/allura/ext/user_profile/user_main.py
index 6709493..7754228 100644
--- a/Allura/allura/ext/user_profile/user_main.py
+++ b/Allura/allura/ext/user_profile/user_main.py
@@ -2,7 +2,8 @@ import logging
from pprint import pformat
import pkg_resources
-from pylons import c, g, request
+from pylons import tmpl_context as c, app_globals as g
+from pylons import request
from formencode import validators
from tg import expose, redirect, validate, response
from webob import exc
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/588145a7/Allura/allura/lib/helpers.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/helpers.py b/Allura/allura/lib/helpers.py
index 4cf3fbc..faa73bd 100644
--- a/Allura/allura/lib/helpers.py
+++ b/Allura/allura/lib/helpers.py
@@ -21,7 +21,8 @@ from dateutil.parser import parse
from bson import ObjectId
from pymongo.errors import InvalidId
from contextlib import contextmanager
-from pylons import c, response, request
+from pylons import tmpl_context as c
+from pylons import response, request
from tg.decorators import before_validate
from formencode.variabledecode import variable_decode
import formencode
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/588145a7/Allura/allura/lib/macro.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/macro.py b/Allura/allura/lib/macro.py
index 4a16226..44ebf2c 100644
--- a/Allura/allura/lib/macro.py
+++ b/Allura/allura/lib/macro.py
@@ -5,7 +5,8 @@ import string
import logging
import pymongo
-from pylons import c, g, request
+from pylons import tmpl_context as c, app_globals as g
+from pylons import request
from . import helpers as h
from . import security
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/588145a7/Allura/allura/lib/oid_helper.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/oid_helper.py b/Allura/allura/lib/oid_helper.py
index c7e2f63..05a1d06 100644
--- a/Allura/allura/lib/oid_helper.py
+++ b/Allura/allura/lib/oid_helper.py
@@ -1,6 +1,7 @@
import logging
-from pylons import g, request
+from pylons import app_globals as g
+from pylons import request
from tg import flash, redirect, session, config
from openid.consumer import consumer
from allura import model as M
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/588145a7/Allura/allura/lib/security.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/security.py b/Allura/allura/lib/security.py
index a7cc8bf..8f73209 100644
--- a/Allura/allura/lib/security.py
+++ b/Allura/allura/lib/security.py
@@ -4,7 +4,8 @@ This module provides the security predicates used in decorating various models.
import logging
from collections import defaultdict
-from pylons import c, request
+from pylons import tmpl_context as c
+from pylons import request
from webob import exc
from itertools import chain
from ming.utils import LazyProperty
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/588145a7/Allura/allura/model/artifact.py
----------------------------------------------------------------------
diff --git a/Allura/allura/model/artifact.py b/Allura/allura/model/artifact.py
index 314a76e..4c24a1c 100644
--- a/Allura/allura/model/artifact.py
+++ b/Allura/allura/model/artifact.py
@@ -5,7 +5,8 @@ from datetime import datetime
import bson
import pymongo
-from pylons import c, request, g
+from pylons import tmpl_context as c, app_globals as g
+from pylons import request
from ming import schema as S
from ming.orm import state, session
from ming.orm import FieldProperty, ForeignIdProperty, RelationProperty
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/588145a7/Allura/allura/model/auth.py
----------------------------------------------------------------------
diff --git a/Allura/allura/model/auth.py b/Allura/allura/model/auth.py
index d676e74..8df4a58 100644
--- a/Allura/allura/model/auth.py
+++ b/Allura/allura/model/auth.py
@@ -14,7 +14,8 @@ from datetime import timedelta, date, datetime, time
import iso8601
import pymongo
-from pylons import c, g, request
+from pylons import tmpl_context as c, app_globals as g
+from pylons import request
from ming import schema as S
from ming import Field, collection
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/588145a7/Allura/allura/model/neighborhood.py
----------------------------------------------------------------------
diff --git a/Allura/allura/model/neighborhood.py b/Allura/allura/model/neighborhood.py
index eafa29a..5f6defd 100644
--- a/Allura/allura/model/neighborhood.py
+++ b/Allura/allura/model/neighborhood.py
@@ -8,10 +8,8 @@ from ming.orm import FieldProperty, RelationProperty, ForeignIdProperty
from ming.orm.declarative import MappedClass
from ming.utils import LazyProperty
-import pylons
-pylons.c = pylons.tmpl_context
-pylons.g = pylons.app_globals
-from pylons import request, c
+from pylons import request
+from pylons import tmpl_context as c
from allura.lib import plugin
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/588145a7/Allura/allura/model/project.py
----------------------------------------------------------------------
diff --git a/Allura/allura/model/project.py b/Allura/allura/model/project.py
index 230c337..93f8257 100644
--- a/Allura/allura/model/project.py
+++ b/Allura/allura/model/project.py
@@ -3,7 +3,8 @@ from collections import Counter, OrderedDict
from datetime import datetime
from tg import config
-from pylons import c, g, request
+from pylons import tmpl_context as c, app_globals as g
+from pylons import request
from ming import schema as S
from ming.utils import LazyProperty
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/588145a7/Allura/allura/tests/model/test_discussion.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/model/test_discussion.py b/Allura/allura/tests/model/test_discussion.py
index a31f043..861f665 100644
--- a/Allura/allura/tests/model/test_discussion.py
+++ b/Allura/allura/tests/model/test_discussion.py
@@ -7,7 +7,8 @@ import time
from datetime import datetime, timedelta
from cgi import FieldStorage
-from pylons import c, g, request, response
+from pylons import tmpl_context as c, app_globals as g
+from pylons import request, response
from nose.tools import assert_raises, assert_equals, with_setup
import mock
from mock import patch
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/588145a7/Allura/allura/tests/model/test_openid.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/model/test_openid.py b/Allura/allura/tests/model/test_openid.py
index 1a29c5b..a6279fc 100644
--- a/Allura/allura/tests/model/test_openid.py
+++ b/Allura/allura/tests/model/test_openid.py
@@ -5,7 +5,8 @@ Model tests for openid_model
import time
import mock
-from pylons import c, g, request
+from pylons import tmpl_context as c, app_globals as g
+from pylons import request
from webob import Request
from openid.association import Association
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/588145a7/AlluraTesting/alluratest/controller.py
----------------------------------------------------------------------
diff --git a/AlluraTesting/alluratest/controller.py b/AlluraTesting/alluratest/controller.py
index bb91acd..488593e 100644
--- a/AlluraTesting/alluratest/controller.py
+++ b/AlluraTesting/alluratest/controller.py
@@ -11,7 +11,8 @@ from formencode import variabledecode
from paste.deploy import loadapp
from paste.deploy.converters import asbool
from paste.script.appinstall import SetupCommand
-from pylons import c, g, url, request, response, session
+from pylons import tmpl_context as c, app_globals as g
+from pylons import url, request, response, session
import tg
from webtest import TestApp
from webob import Request, Response
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/588145a7/AlluraTesting/alluratest/validation.py
----------------------------------------------------------------------
diff --git a/AlluraTesting/alluratest/validation.py b/AlluraTesting/alluratest/validation.py
index 5aa17d7..d04397a 100644
--- a/AlluraTesting/alluratest/validation.py
+++ b/AlluraTesting/alluratest/validation.py
@@ -17,7 +17,8 @@ import mock
import beaker.session
from paste.deploy import loadapp
from paste.script.appinstall import SetupCommand
-from pylons import c, g, url, request, response, session
+from pylons import tmpl_context as c, app_globals as g
+from pylons import url, request, response, session
import webtest
from webtest import TestApp
from webob import Request, Response
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/588145a7/ForgeActivity/forgeactivity/main.py
----------------------------------------------------------------------
diff --git a/ForgeActivity/forgeactivity/main.py b/ForgeActivity/forgeactivity/main.py
index 4255788..3331293 100644
--- a/ForgeActivity/forgeactivity/main.py
+++ b/ForgeActivity/forgeactivity/main.py
@@ -3,7 +3,8 @@ import logging
import pylons
pylons.c = pylons.tmpl_context
pylons.g = pylons.app_globals
-from pylons import c, g, request
+from pylons import tmpl_context as c, app_globals as g
+from pylons import request
from tg import expose, validate, config
from tg.decorators import with_trailing_slash
from paste.deploy.converters import asbool
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/588145a7/ForgeBlog/forgeblog/main.py
----------------------------------------------------------------------
diff --git a/ForgeBlog/forgeblog/main.py b/ForgeBlog/forgeblog/main.py
index 9981317..1cfd96a 100644
--- a/ForgeBlog/forgeblog/main.py
+++ b/ForgeBlog/forgeblog/main.py
@@ -8,7 +8,8 @@ import pkg_resources
import pymongo
from tg import config, expose, validate, redirect, flash
from tg.decorators import with_trailing_slash, without_trailing_slash
-from pylons import g, c, request, response
+from pylons import tmpl_context as c, app_globals as g
+from pylons import request, response
from paste.deploy.converters import asbool
import formencode
from formencode import validators
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/588145a7/ForgeChat/forgechat/main.py
----------------------------------------------------------------------
diff --git a/ForgeChat/forgechat/main.py b/ForgeChat/forgechat/main.py
index 757d220..6d2eb9a 100644
--- a/ForgeChat/forgechat/main.py
+++ b/ForgeChat/forgechat/main.py
@@ -8,7 +8,8 @@ from datetime import date, time, datetime, timedelta
import pkg_resources
from tg import expose, validate, redirect, flash
from tg.decorators import with_trailing_slash
-from pylons import g, c, request
+from pylons import tmpl_context as c, app_globals as g
+from pylons import request
from formencode import validators
# Pyforge-specific imports
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/588145a7/ForgeDiscussion/forgediscussion/controllers/root.py
----------------------------------------------------------------------
diff --git a/ForgeDiscussion/forgediscussion/controllers/root.py b/ForgeDiscussion/forgediscussion/controllers/root.py
index 5420ef2..8c87de2 100644
--- a/ForgeDiscussion/forgediscussion/controllers/root.py
+++ b/ForgeDiscussion/forgediscussion/controllers/root.py
@@ -9,7 +9,8 @@ pylons.c = pylons.tmpl_context
pylons.g = pylons.app_globals
from tg import expose, validate, redirect, flash, response
from tg.decorators import with_trailing_slash
-from pylons import g, c, request
+from pylons import tmpl_context as c, app_globals as g
+from pylons import request
from formencode import validators
from webob import exc
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/588145a7/ForgeDiscussion/forgediscussion/forum_main.py
----------------------------------------------------------------------
diff --git a/ForgeDiscussion/forgediscussion/forum_main.py b/ForgeDiscussion/forgediscussion/forum_main.py
index 6cafe1e..c7f1361 100644
--- a/ForgeDiscussion/forgediscussion/forum_main.py
+++ b/ForgeDiscussion/forgediscussion/forum_main.py
@@ -5,7 +5,8 @@ from itertools import islice
# Non-stdlib imports
import pymongo
-from pylons import g, c, request
+from pylons import tmpl_context as c, app_globals as g
+from pylons import request
from tg import expose, redirect, flash, url, validate
from tg.decorators import with_trailing_slash
from bson import ObjectId
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/588145a7/ForgeLink/forgelink/link_main.py
----------------------------------------------------------------------
diff --git a/ForgeLink/forgelink/link_main.py b/ForgeLink/forgelink/link_main.py
index 534dc21..a6128f5 100644
--- a/ForgeLink/forgelink/link_main.py
+++ b/ForgeLink/forgelink/link_main.py
@@ -4,7 +4,8 @@ import logging
# Non-stdlib imports
import pkg_resources
from tg import expose, validate, redirect, response, flash
-from pylons import g, c, request
+from pylons import tmpl_context as c, app_globals as g
+from pylons import request
# Pyforge-specific imports
from allura.app import Application, ConfigOption, SitemapEntry, DefaultAdminController
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/588145a7/ForgeSVN/forgesvn/svn_main.py
----------------------------------------------------------------------
diff --git a/ForgeSVN/forgesvn/svn_main.py b/ForgeSVN/forgesvn/svn_main.py
index 3f0c8b6..29e531a 100644
--- a/ForgeSVN/forgesvn/svn_main.py
+++ b/ForgeSVN/forgesvn/svn_main.py
@@ -1,6 +1,7 @@
#-*- python -*-
import logging
-from pylons import c, request
+from pylons import tmpl_context as c
+from pylons import request
# Non-stdlib imports
from ming.utils import LazyProperty
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/588145a7/ForgeTracker/forgetracker/tracker_main.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/tracker_main.py b/ForgeTracker/forgetracker/tracker_main.py
index 8b9362c..d83466c 100644
--- a/ForgeTracker/forgetracker/tracker_main.py
+++ b/ForgeTracker/forgetracker/tracker_main.py
@@ -12,7 +12,8 @@ from itertools import ifilter
import pkg_resources
from tg import expose, validate, redirect, flash, url, config
from tg.decorators import with_trailing_slash, without_trailing_slash
-from pylons import g, c, request, response
+from pylons import tmpl_context as c, app_globals as g
+from pylons import request, response
from formencode import validators
from bson import ObjectId
from bson.errors import InvalidId
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/588145a7/ForgeWiki/forgewiki/model/wiki.py
----------------------------------------------------------------------
diff --git a/ForgeWiki/forgewiki/model/wiki.py b/ForgeWiki/forgewiki/model/wiki.py
index 7744b13..af88c04 100644
--- a/ForgeWiki/forgewiki/model/wiki.py
+++ b/ForgeWiki/forgewiki/model/wiki.py
@@ -1,9 +1,6 @@
-import pylons
import difflib
-pylons.c = pylons.tmpl_context
-pylons.g = pylons.app_globals
-from pylons import g #g is a namespace for globally accessable app helpers
-from pylons import c as context
+from pylons import app_globals as g #g is a namespace for globally accessable app helpers
+from pylons import tmpl_context as context
from ming import schema
from ming.orm import FieldProperty, ForeignIdProperty, Mapper, session
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/588145a7/ForgeWiki/forgewiki/tests/test_wiki2markdown.py
----------------------------------------------------------------------
diff --git a/ForgeWiki/forgewiki/tests/test_wiki2markdown.py b/ForgeWiki/forgewiki/tests/test_wiki2markdown.py
index 5fdfe57..7aa9a03 100644
--- a/ForgeWiki/forgewiki/tests/test_wiki2markdown.py
+++ b/ForgeWiki/forgewiki/tests/test_wiki2markdown.py
@@ -10,9 +10,7 @@ from allura import model as M
from forgewiki import model as WM
from allura.lib import helpers as h
-import pylons
-pylons.c = pylons.tmpl_context
-from pylons import c as context
+from pylons import tmpl_context as context
class TestMySQLExtractor(object):
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/588145a7/ForgeWiki/forgewiki/wiki_main.py
----------------------------------------------------------------------
diff --git a/ForgeWiki/forgewiki/wiki_main.py b/ForgeWiki/forgewiki/wiki_main.py
index ba151da..f15c634 100644
--- a/ForgeWiki/forgewiki/wiki_main.py
+++ b/ForgeWiki/forgewiki/wiki_main.py
@@ -8,7 +8,8 @@ from datetime import datetime
from tg import expose, validate, redirect, response, flash
from tg.decorators import with_trailing_slash, without_trailing_slash
from tg.controllers import RestController
-from pylons import g, c, request
+from pylons import tmpl_context as c, app_globals as g
+from pylons import request
from formencode import validators
from webob import exc
from ming.orm import session