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:17 UTC
[50/50] [abbrv] git commit: Fix pylons globals imports
Updated Branches:
refs/heads/si/5453 de942ac45 -> 2bb9cd618 (forced update)
Fix pylons globals imports
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/2bb9cd61
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/2bb9cd61
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/2bb9cd61
Branch: refs/heads/si/5453
Commit: 2bb9cd618304bfcc60bd0d03eeb72c7a076ec957
Parents: 5a80433
Author: Tim Van Steenburgh <tv...@gmail.com>
Authored: Mon Feb 25 21:55:33 2013 +0000
Committer: Tim Van Steenburgh <tv...@gmail.com>
Committed: Mon Feb 25 21:55:33 2013 +0000
----------------------------------------------------------------------
Allura/allura/model/contrib_stats.py | 3 ++-
.../forgeuserstats/controllers/userstats.py | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/2bb9cd61/Allura/allura/model/contrib_stats.py
----------------------------------------------------------------------
diff --git a/Allura/allura/model/contrib_stats.py b/Allura/allura/model/contrib_stats.py
index d9cada2..4d9e1e9 100644
--- a/Allura/allura/model/contrib_stats.py
+++ b/Allura/allura/model/contrib_stats.py
@@ -1,5 +1,6 @@
import pymongo
-from pylons import c, g, request
+from pylons import tmpl_context as c, app_globals as g
+from pylons import request
import bson
from ming import schema as S
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/2bb9cd61/ForgeUserStats/forgeuserstats/controllers/userstats.py
----------------------------------------------------------------------
diff --git a/ForgeUserStats/forgeuserstats/controllers/userstats.py b/ForgeUserStats/forgeuserstats/controllers/userstats.py
index c77dded..40ad92c 100644
--- a/ForgeUserStats/forgeuserstats/controllers/userstats.py
+++ b/ForgeUserStats/forgeuserstats/controllers/userstats.py
@@ -5,7 +5,7 @@ from allura.controllers import BaseController
import allura.model as M
from allura.lib.graphics.graphic_methods import create_histogram, create_progress_bar
from forgeuserstats.model.stats import UserStats
-from pylons import c
+from pylons import tmpl_context as c
class ForgeUserStatsController(BaseController):