incubator-allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tvansteenbu...@apache.org
Subject [42/50] [abbrv] git commit: Fix pylons globals imports
Date Tue, 12 Mar 2013 20:04:50 GMT
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/e70add25
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/e70add25
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/e70add25

Branch: refs/heads/si/5453
Commit: e70add25005b7d41af051782b86188adbbdbc3ae
Parents: ca1ce94
Author: Tim Van Steenburgh <tvansteenburgh@gmail.com>
Authored: Mon Feb 25 21:55:33 2013 +0000
Committer: Tim Van Steenburgh <tvansteenburgh@gmail.com>
Committed: Tue Mar 12 16:29:59 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/e70add25/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/e70add25/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):
 


Mime
View raw message