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
[5/7] git commit: [#5837] update tricky bits referencing pylons.c|g
[#5837] update tricky bits referencing pylons.c|g
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/caeee1f4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/caeee1f4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/caeee1f4
Branch: refs/heads/db/5837
Commit: caeee1f4e266d9f27f137273fec64e6253425e09
Parents: e80ac6f
Author: Dave Brondsema <db...@geek.net>
Authored: Tue Feb 19 17:10:13 2013 +0000
Committer: Dave Brondsema <db...@geek.net>
Committed: Tue Feb 19 18:02:12 2013 +0000
----------------------------------------------------------------------
Allura/allura/command/base.py | 4 ++--
Allura/allura/websetup/schema.py | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/caeee1f4/Allura/allura/command/base.py
----------------------------------------------------------------------
diff --git a/Allura/allura/command/base.py b/Allura/allura/command/base.py
index 5fc7ed1..5914557 100644
--- a/Allura/allura/command/base.py
+++ b/Allura/allura/command/base.py
@@ -67,8 +67,8 @@ class Command(command.Command):
def setup_globals(self):
import allura.lib.app_globals
self.registry.prepare()
- self.registry.register(pylons.c, EmptyClass())
- self.registry.register(pylons.g, self.globals)
+ self.registry.register(pylons.tmpl_context, EmptyClass())
+ self.registry.register(pylons.app_globals, self.globals)
self.registry.register(allura.credentials, allura.lib.security.Credentials())
pylons.tmpl_context.queued_messages = None
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/caeee1f4/Allura/allura/websetup/schema.py
----------------------------------------------------------------------
diff --git a/Allura/allura/websetup/schema.py b/Allura/allura/websetup/schema.py
index 867b5ba..09fd87d 100644
--- a/Allura/allura/websetup/schema.py
+++ b/Allura/allura/websetup/schema.py
@@ -15,8 +15,8 @@ def setup_schema(command, conf, vars):
import allura
REGISTRY.prepare()
- REGISTRY.register(pylons.c, EmptyClass())
- REGISTRY.register(pylons.g, config['pylons.app_globals'])
+ REGISTRY.register(pylons.tmpl_context, EmptyClass())
+ REGISTRY.register(pylons.app_globals, config['pylons.app_globals'])
REGISTRY.register(allura.credentials, allura.lib.security.Credentials())
ming.configure(**conf)
# Nothing to do