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:43 UTC
[4/7] git commit: [#5837] remove pylons backwards compat code
[#5837] remove pylons backwards compat code
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/3f3ab2cd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/3f3ab2cd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/3f3ab2cd
Branch: refs/heads/db/5837
Commit: 3f3ab2cd8703791a245cbd1e869746bdc4fa5d4d
Parents: d122a01
Author: Dave Brondsema <db...@geek.net>
Authored: Tue Feb 19 03:55:44 2013 +0000
Committer: Dave Brondsema <db...@geek.net>
Committed: Tue Feb 19 18:02:11 2013 +0000
----------------------------------------------------------------------
Allura/allura/command/base.py | 6 +++---
Allura/allura/command/taskd.py | 8 ++++----
Allura/allura/config/environment.py | 3 ---
Allura/allura/config/middleware.py | 7 ++-----
Allura/allura/lib/base.py | 2 +-
Allura/allura/lib/helpers.py | 13 +++++--------
Allura/allura/model/neighborhood.py | 6 +++---
Allura/allura/tests/test_tasks.py | 3 ---
AlluraTesting/alluratest/controller.py | 3 ---
ForgeActivity/forgeactivity/main.py | 3 ---
ForgeBlog/forgeblog/model/blog.py | 3 ---
ForgeBlog/forgeblog/tests/test_commands.py | 5 +----
ForgeBlog/forgeblog/tests/unit/__init__.py | 2 --
.../forgediscussion/controllers/root.py | 3 ---
.../forgediscussion/tests/functional/test_forum.py | 3 ---
.../tests/functional/test_import.py | 3 ---
.../forgegit/tests/functional/test_controllers.py | 3 ---
ForgeGit/forgegit/tests/model/test_repository.py | 3 ---
.../forgesvn/tests/functional/test_controllers.py | 3 ---
ForgeShortUrl/forgeshorturl/main.py | 4 ++--
ForgeShortUrl/forgeshorturl/model/shorturl.py | 2 --
.../forgeshorturl/tests/functional/test.py | 2 --
ForgeTracker/forgetracker/model/ticket.py | 3 ---
.../forgetracker/tests/functional/test_import.py | 3 ---
.../forgetracker/tests/functional/test_rest.py | 3 ---
ForgeTracker/forgetracker/tests/unit/__init__.py | 3 ---
26 files changed, 21 insertions(+), 81 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/3f3ab2cd/Allura/allura/command/base.py
----------------------------------------------------------------------
diff --git a/Allura/allura/command/base.py b/Allura/allura/command/base.py
index be9d8e8..5fc7ed1 100644
--- a/Allura/allura/command/base.py
+++ b/Allura/allura/command/base.py
@@ -53,12 +53,12 @@ class Command(command.Command):
M=model
ming.configure(**conf)
activitystream.configure(**conf)
- pylons.c.user = M.User.anonymous()
+ pylons.tmpl_context.user = M.User.anonymous()
else:
# Probably being called from another script (websetup, perhaps?)
log = logging.getLogger('allura.command')
conf = pylons.config
- self.tools = pylons.g.entry_points['tool'].values()
+ self.tools = pylons.app_globals.entry_points['tool'].values()
for ep in iter_entry_points('allura.command_init'):
log.info('Running command_init for %s', ep.name)
ep.load()(conf)
@@ -70,7 +70,7 @@ class Command(command.Command):
self.registry.register(pylons.c, EmptyClass())
self.registry.register(pylons.g, self.globals)
self.registry.register(allura.credentials, allura.lib.security.Credentials())
- pylons.c.queued_messages = None
+ pylons.tmpl_context.queued_messages = None
def teardown_globals(self):
self.registry.cleanup()
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/3f3ab2cd/Allura/allura/command/taskd.py
----------------------------------------------------------------------
diff --git a/Allura/allura/command/taskd.py b/Allura/allura/command/taskd.py
index be33814..d3ce926 100644
--- a/Allura/allura/command/taskd.py
+++ b/Allura/allura/command/taskd.py
@@ -74,7 +74,7 @@ class TaskdCommand(base.Command):
def waitfunc_amqp():
try:
- return pylons.g.amq_conn.queue.get(timeout=poll_interval)
+ return pylons.app_globals.amq_conn.queue.get(timeout=poll_interval)
except Queue.Empty:
return None
@@ -89,14 +89,14 @@ class TaskdCommand(base.Command):
raise StopIteration
return waitfunc_checks_running
- if pylons.g.amq_conn:
+ if pylons.app_globals.amq_conn:
waitfunc = waitfunc_amqp
else:
waitfunc = waitfunc_noq
waitfunc = check_running(waitfunc)
while self.keep_running:
- if pylons.g.amq_conn:
- pylons.g.amq_conn.reset()
+ if pylons.app_globals.amq_conn:
+ pylons.app_globals.amq_conn.reset()
try:
while self.keep_running:
self.task = M.MonQTask.get(
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/3f3ab2cd/Allura/allura/config/environment.py
----------------------------------------------------------------------
diff --git a/Allura/allura/config/environment.py b/Allura/allura/config/environment.py
index 60eb22b..8606a08 100644
--- a/Allura/allura/config/environment.py
+++ b/Allura/allura/config/environment.py
@@ -1,9 +1,6 @@
# -*- coding: utf-8 -*-
"""WSGI environment setup for allura."""
-import pylons
-pylons.c = pylons.tmpl_context
-pylons.g = pylons.app_globals
import pylons.middleware
import tg
import tg.error
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/3f3ab2cd/Allura/allura/config/middleware.py
----------------------------------------------------------------------
diff --git a/Allura/allura/config/middleware.py b/Allura/allura/config/middleware.py
index 68a6d1f..d549d6c 100644
--- a/Allura/allura/config/middleware.py
+++ b/Allura/allura/config/middleware.py
@@ -2,12 +2,9 @@
"""WSGI middleware initialization for the allura application."""
import mimetypes
-import pylons
import pylons.middleware
import tg
import tg.error
-pylons.c = pylons.tmpl_context
-pylons.g = pylons.app_globals
import pkg_resources
from tg import config
from paste.deploy.converters import asbool
@@ -171,8 +168,8 @@ def get_tg_vars(context):
import pylons, tg
from allura.lib import helpers as h
from urllib import quote, quote_plus
- context.setdefault('g', pylons.g)
- context.setdefault('c', pylons.c)
+ context.setdefault('g', pylons.app_globals)
+ context.setdefault('c', pylons.tmpl_context)
context.setdefault('h', h)
context.setdefault('request', pylons.request)
context.setdefault('response', pylons.response)
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/3f3ab2cd/Allura/allura/lib/base.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/base.py b/Allura/allura/lib/base.py
index a0abd16..90db754 100644
--- a/Allura/allura/lib/base.py
+++ b/Allura/allura/lib/base.py
@@ -15,7 +15,7 @@ class WsgiDispatchController(TGController):
"""
def _setup_request(self):
- '''Responsible for setting all the values we need to be set on pylons.c'''
+ '''Responsible for setting all the values we need to be set on pylons.tmpl_context'''
raise NotImplementedError, '_setup_request'
def _cleanup_request(self):
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/3f3ab2cd/Allura/allura/lib/helpers.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/helpers.py b/Allura/allura/lib/helpers.py
index faa73bd..d078072 100644
--- a/Allura/allura/lib/helpers.py
+++ b/Allura/allura/lib/helpers.py
@@ -13,15 +13,12 @@ from datetime import datetime, timedelta
import tg
import genshi.template
import chardet
-import pylons
-pylons.c = pylons.tmpl_context
-pylons.g = pylons.app_globals
from formencode.validators import FancyValidator
from dateutil.parser import parse
from bson import ObjectId
from pymongo.errors import InvalidId
from contextlib import contextmanager
-from pylons import tmpl_context as c
+from pylons import tmpl_context as c, app_globals as g
from pylons import response, request
from tg.decorators import before_validate
from formencode.variabledecode import variable_decode
@@ -588,11 +585,11 @@ def render_any_markup(name, text, code_mode=False, linenumbers_style=TABLE):
if text == '':
text = '<p><em>Empty File</em></p>'
else:
- fmt = pylons.g.pypeline_markup.can_render(name)
+ fmt = g.pypeline_markup.can_render(name)
if fmt == 'markdown':
- text = pylons.g.markdown.convert(text)
+ text = g.markdown.convert(text)
else:
- text = pylons.g.pypeline_markup.render(name, text)
+ text = g.pypeline_markup.render(name, text)
if not fmt:
if code_mode and linenumbers_style == INLINE:
text = _add_inline_line_numbers_to_text(text)
@@ -647,5 +644,5 @@ def log_if_changed(artifact, attr, new_val, message):
def get_tool_package(tool_name):
"Return package for given tool (e.g. 'forgetracker' for 'tickets')"
- app = pylons.g.entry_points['tool'].get(tool_name.lower())
+ app = g.entry_points['tool'].get(tool_name.lower())
return app.__module__.split('.')[0] if app else ''
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/3f3ab2cd/Allura/allura/model/neighborhood.py
----------------------------------------------------------------------
diff --git a/Allura/allura/model/neighborhood.py b/Allura/allura/model/neighborhood.py
index 5f6defd..b04c0f0 100644
--- a/Allura/allura/model/neighborhood.py
+++ b/Allura/allura/model/neighborhood.py
@@ -9,7 +9,7 @@ from ming.orm.declarative import MappedClass
from ming.utils import LazyProperty
from pylons import request
-from pylons import tmpl_context as c
+from pylons import tmpl_context as c, app_globals as g
from allura.lib import plugin
@@ -223,11 +223,11 @@ class Neighborhood(MappedClass):
if 'addopt-icon-theme' in css_form_dict:
if css_form_dict['addopt-icon-theme'] == "dark":
icon_theme = ".pad h2.dark small b.ico {background-image: url('%s%s');}" % (
- pylons.g.theme_href(''),
+ g.theme_href(''),
'images/neo-icon-set-ffffff-256x350.png')
elif css_form_dict['addopt-icon-theme'] == "white":
icon_theme = ".pad h2.dark small b.ico {background-image: url('%s%s');}" % (
- pylons.g.theme_href(''),
+ g.theme_href(''),
'images/neo-icon-set-454545-256x350.png')
css_text += "/*titlebarcolor*/.pad h2.title, .pad h2.title small a {color:%s;} %s\n" % (css_form_dict['titlebarcolor'], icon_theme)
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/3f3ab2cd/Allura/allura/tests/test_tasks.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/test_tasks.py b/Allura/allura/tests/test_tasks.py
index b7bfdbf..74a09d0 100644
--- a/Allura/allura/tests/test_tasks.py
+++ b/Allura/allura/tests/test_tasks.py
@@ -5,9 +5,6 @@ import unittest
from base64 import b64encode
import mock
-import pylons
-pylons.c = pylons.tmpl_context
-pylons.g = pylons.app_globals
from pylons import tmpl_context as c, app_globals as g
from datadiff.tools import assert_equal
from nose.tools import assert_in
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/3f3ab2cd/AlluraTesting/alluratest/controller.py
----------------------------------------------------------------------
diff --git a/AlluraTesting/alluratest/controller.py b/AlluraTesting/alluratest/controller.py
index 488593e..9a94d97 100644
--- a/AlluraTesting/alluratest/controller.py
+++ b/AlluraTesting/alluratest/controller.py
@@ -2,9 +2,6 @@
import os
import urllib
-import pylons
-pylons.c = pylons.tmpl_context
-pylons.g = pylons.app_globals
import mock
import beaker.session
from formencode import variabledecode
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/3f3ab2cd/ForgeActivity/forgeactivity/main.py
----------------------------------------------------------------------
diff --git a/ForgeActivity/forgeactivity/main.py b/ForgeActivity/forgeactivity/main.py
index 3331293..accd755 100644
--- a/ForgeActivity/forgeactivity/main.py
+++ b/ForgeActivity/forgeactivity/main.py
@@ -1,8 +1,5 @@
import logging
-import pylons
-pylons.c = pylons.tmpl_context
-pylons.g = pylons.app_globals
from pylons import tmpl_context as c, app_globals as g
from pylons import request
from tg import expose, validate, config
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/3f3ab2cd/ForgeBlog/forgeblog/model/blog.py
----------------------------------------------------------------------
diff --git a/ForgeBlog/forgeblog/model/blog.py b/ForgeBlog/forgeblog/model/blog.py
index 1348205..a2dae6c 100644
--- a/ForgeBlog/forgeblog/model/blog.py
+++ b/ForgeBlog/forgeblog/model/blog.py
@@ -3,9 +3,6 @@ import functools
from datetime import datetime
from random import randint
-import pylons
-pylons.c = pylons.tmpl_context
-pylons.g = pylons.app_globals
from pylons import tmpl_context as c, app_globals as g
from pymongo.errors import DuplicateKeyError
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/3f3ab2cd/ForgeBlog/forgeblog/tests/test_commands.py
----------------------------------------------------------------------
diff --git a/ForgeBlog/forgeblog/tests/test_commands.py b/ForgeBlog/forgeblog/tests/test_commands.py
index 094ab45..8dc6aee 100644
--- a/ForgeBlog/forgeblog/tests/test_commands.py
+++ b/ForgeBlog/forgeblog/tests/test_commands.py
@@ -1,7 +1,4 @@
from datetime import datetime, timedelta
-import pylons
-pylons.c = pylons.tmpl_context
-pylons.g = pylons.app_globals
from pylons import tmpl_context as c, app_globals as g
from datadiff.tools import assert_equal
@@ -183,4 +180,4 @@ http://blah.com/?x=y&a=b - not escaped either
'a foo bar\n\n code here?')
assert_equal(rssfeeds.plain2markdown('\ttab before (stuff)', preserve_multiple_spaces=True),
- ' tab before \(stuff\)')
\ No newline at end of file
+ ' tab before \(stuff\)')
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/3f3ab2cd/ForgeBlog/forgeblog/tests/unit/__init__.py
----------------------------------------------------------------------
diff --git a/ForgeBlog/forgeblog/tests/unit/__init__.py b/ForgeBlog/forgeblog/tests/unit/__init__.py
index 4814c42..bb8c362 100644
--- a/ForgeBlog/forgeblog/tests/unit/__init__.py
+++ b/ForgeBlog/forgeblog/tests/unit/__init__.py
@@ -1,5 +1,3 @@
-import pylons
-pylons.c = pylons.tmpl_context
from pylons import tmpl_context as c
from ming.orm.ormsession import ThreadLocalORMSession
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/3f3ab2cd/ForgeDiscussion/forgediscussion/controllers/root.py
----------------------------------------------------------------------
diff --git a/ForgeDiscussion/forgediscussion/controllers/root.py b/ForgeDiscussion/forgediscussion/controllers/root.py
index 8c87de2..bdc82b2 100644
--- a/ForgeDiscussion/forgediscussion/controllers/root.py
+++ b/ForgeDiscussion/forgediscussion/controllers/root.py
@@ -4,9 +4,6 @@ import logging
import pymongo
from urllib import urlencode, unquote
-import pylons
-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 tmpl_context as c, app_globals as g
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/3f3ab2cd/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 4f5e69f..3237eaf 100644
--- a/ForgeDiscussion/forgediscussion/tests/functional/test_forum.py
+++ b/ForgeDiscussion/forgediscussion/tests/functional/test_forum.py
@@ -7,9 +7,6 @@ from email.mime.image import MIMEImage
from email.mime.multipart import MIMEMultipart
import pkg_resources
-import pylons
-pylons.c = pylons.tmpl_context
-pylons.g = pylons.app_globals
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/3f3ab2cd/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 723e58c..5a328be 100644
--- a/ForgeDiscussion/forgediscussion/tests/functional/test_import.py
+++ b/ForgeDiscussion/forgediscussion/tests/functional/test_import.py
@@ -4,9 +4,6 @@ from datetime import datetime, timedelta
from nose.tools import assert_equal
import ming
-import pylons
-pylons.c = pylons.tmpl_context
-pylons.g = pylons.app_globals
from pylons import tmpl_context as c, app_globals as g
from allura import model as M
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/3f3ab2cd/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 111cd6e..c8abd79 100644
--- a/ForgeGit/forgegit/tests/functional/test_controllers.py
+++ b/ForgeGit/forgegit/tests/functional/test_controllers.py
@@ -3,9 +3,6 @@ import re
import tg
import pkg_resources
-import pylons
-pylons.c = pylons.tmpl_context
-pylons.g = pylons.app_globals
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/3f3ab2cd/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 562f989..1906470 100644
--- a/ForgeGit/forgegit/tests/model/test_repository.py
+++ b/ForgeGit/forgegit/tests/model/test_repository.py
@@ -4,9 +4,6 @@ import unittest
import pkg_resources
import mock
-import pylons
-pylons.c = pylons.tmpl_context
-pylons.g = pylons.app_globals
from pylons import tmpl_context as c, app_globals as g
from ming.base import Object
from ming.orm import ThreadLocalORMSession, session
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/3f3ab2cd/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 25f6eb4..535e609 100644
--- a/ForgeSVN/forgesvn/tests/functional/test_controllers.py
+++ b/ForgeSVN/forgesvn/tests/functional/test_controllers.py
@@ -1,9 +1,6 @@
import json
import pkg_resources
-import pylons
-pylons.c = pylons.tmpl_context
-pylons.g = pylons.app_globals
from pylons import tmpl_context as c
from ming.orm import ThreadLocalORMSession
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/3f3ab2cd/ForgeShortUrl/forgeshorturl/main.py
----------------------------------------------------------------------
diff --git a/ForgeShortUrl/forgeshorturl/main.py b/ForgeShortUrl/forgeshorturl/main.py
index 4036a85..53d96c8 100644
--- a/ForgeShortUrl/forgeshorturl/main.py
+++ b/ForgeShortUrl/forgeshorturl/main.py
@@ -223,9 +223,9 @@ class ShortURLAdminController(DefaultAdminController):
else:
require_access(self.app, 'create')
if request.method == 'POST':
- if pylons.c.form_errors:
+ if c.form_errors:
error_msg = 'Error: '
- for msg in list(pylons.c.form_errors):
+ for msg in list(c.form_errors):
names = {'short_url': 'Short url', 'full_url': 'Full URL'}
error_msg += '%s: %s ' % (names[msg], c.form_errors[msg])
flash(error_msg, 'error')
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/3f3ab2cd/ForgeShortUrl/forgeshorturl/model/shorturl.py
----------------------------------------------------------------------
diff --git a/ForgeShortUrl/forgeshorturl/model/shorturl.py b/ForgeShortUrl/forgeshorturl/model/shorturl.py
index b5c0ba6..7e550b7 100644
--- a/ForgeShortUrl/forgeshorturl/model/shorturl.py
+++ b/ForgeShortUrl/forgeshorturl/model/shorturl.py
@@ -1,6 +1,4 @@
import pymongo
-import pylons
-pylons.c = pylons.tmpl_context
from pylons import tmpl_context as c
from ming.orm import FieldProperty, ForeignIdProperty, session
from datetime import datetime
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/3f3ab2cd/ForgeShortUrl/forgeshorturl/tests/functional/test.py
----------------------------------------------------------------------
diff --git a/ForgeShortUrl/forgeshorturl/tests/functional/test.py b/ForgeShortUrl/forgeshorturl/tests/functional/test.py
index 75e044b..babd1a5 100644
--- a/ForgeShortUrl/forgeshorturl/tests/functional/test.py
+++ b/ForgeShortUrl/forgeshorturl/tests/functional/test.py
@@ -1,5 +1,3 @@
-import pylons
-pylons.c = pylons.tmpl_context
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/3f3ab2cd/ForgeTracker/forgetracker/model/ticket.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/model/ticket.py b/ForgeTracker/forgetracker/model/ticket.py
index 81782a7..d98f72a 100644
--- a/ForgeTracker/forgetracker/model/ticket.py
+++ b/ForgeTracker/forgetracker/model/ticket.py
@@ -5,9 +5,6 @@ import difflib
from datetime import datetime, timedelta
import pymongo
-import pylons
-pylons.c = pylons.tmpl_context
-pylons.g = pylons.app_globals
from pymongo.errors import OperationFailure
from pylons import tmpl_context as c, app_globals as g
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/3f3ab2cd/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 9778aa0..da3cb27 100644
--- a/ForgeTracker/forgetracker/tests/functional/test_import.py
+++ b/ForgeTracker/forgetracker/tests/functional/test_import.py
@@ -4,9 +4,6 @@ from datetime import datetime, timedelta
from nose.tools import assert_equal
import ming
-import pylons
-pylons.c = pylons.tmpl_context
-pylons.g = pylons.app_globals
from pylons import app_globals as g
from allura import model as M
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/3f3ab2cd/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 53b0d7d..a2838c8 100644
--- a/ForgeTracker/forgetracker/tests/functional/test_rest.py
+++ b/ForgeTracker/forgetracker/tests/functional/test_rest.py
@@ -1,6 +1,3 @@
-import pylons
-pylons.c = pylons.tmpl_context
-pylons.g = pylons.app_globals
from pylons import tmpl_context as c
from datadiff.tools import assert_equal
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/3f3ab2cd/ForgeTracker/forgetracker/tests/unit/__init__.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/tests/unit/__init__.py b/ForgeTracker/forgetracker/tests/unit/__init__.py
index 17fe7d2..080355c 100644
--- a/ForgeTracker/forgetracker/tests/unit/__init__.py
+++ b/ForgeTracker/forgetracker/tests/unit/__init__.py
@@ -1,6 +1,3 @@
-import pylons
-pylons.c = pylons.tmpl_context
-pylons.g = pylons.app_globals
from pylons import tmpl_context as c
from ming.orm.ormsession import ThreadLocalORMSession