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 E9889FB31 for ; Mon, 8 Apr 2013 15:19:04 +0000 (UTC) Received: (qmail 29931 invoked by uid 500); 8 Apr 2013 15:19:04 -0000 Delivered-To: apmail-incubator-allura-commits-archive@incubator.apache.org Received: (qmail 29888 invoked by uid 500); 8 Apr 2013 15:19:04 -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 29736 invoked by uid 99); 8 Apr 2013 15:19: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; Mon, 08 Apr 2013 15:19:04 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 2C12E50DCC; Mon, 8 Apr 2013 15:19: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: Mon, 08 Apr 2013 15:19:32 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [31/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/86799b5f Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/86799b5f Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/86799b5f Branch: refs/heads/db/6007 Commit: 86799b5fd68e38a8c349ff50a9db02bd500123d2 Parents: 656a7b3 Author: Tim Van Steenburgh Authored: Mon Feb 25 21:55:33 2013 +0000 Committer: Dave Brondsema Committed: Thu Apr 4 18:37:36 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/86799b5f/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/86799b5f/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):