Return-Path: X-Original-To: apmail-incubator-allura-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-allura-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 2DE3DF9CA for ; Thu, 4 Apr 2013 18:37:06 +0000 (UTC) Received: (qmail 37221 invoked by uid 500); 4 Apr 2013 18:37:06 -0000 Delivered-To: apmail-incubator-allura-commits-archive@incubator.apache.org Received: (qmail 37155 invoked by uid 500); 4 Apr 2013 18:37:06 -0000 Mailing-List: contact allura-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: allura-dev@incubator.apache.org Delivered-To: mailing list allura-commits@incubator.apache.org Received: (qmail 36371 invoked by uid 99); 4 Apr 2013 18:37:04 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 04 Apr 2013 18:37:04 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 2DD26837C5A; Thu, 4 Apr 2013 18:37:04 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: brondsem@apache.org To: allura-commits@incubator.apache.org Date: Thu, 04 Apr 2013 18:37:35 -0000 Message-Id: <88b12f48984d44ad891da60cd637a4e4@git.apache.org> In-Reply-To: <42397c3a49c54cdc8a5babb903962587@git.apache.org> References: <42397c3a49c54cdc8a5babb903962587@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [33/50] [abbrv] git commit: Fix pylons globals imports 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/4327087d Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/4327087d Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/4327087d Branch: refs/heads/db/5453 Commit: 4327087d52ac8f9a6f8f8129f93c7bf384e7515c Parents: 4fcb8a0 Author: Tim Van Steenburgh Authored: Mon Feb 25 21:55:33 2013 +0000 Committer: Dave Brondsema Committed: Wed Apr 3 21:45:15 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/4327087d/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/4327087d/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):