|
Luke Macken |
9ab0946 |
diff --git a/tg/configuration.py b/tg/configuration.py
|
|
Luke Macken |
9ab0946 |
--- a/tg/configuration.py
|
|
Luke Macken |
9ab0946 |
+++ b/tg/configuration.py
|
|
Luke Macken |
9ab0946 |
@@ -270,18 +270,16 @@ class AppConfig(Bunch):
|
|
Luke Macken |
9ab0946 |
Override this method to customize the way that ``app_globals``
|
|
Luke Macken |
9ab0946 |
and ``helpers`` are setup.
|
|
Luke Macken |
9ab0946 |
|
|
Luke Macken |
9ab0946 |
"""
|
|
Luke Macken |
9ab0946 |
|
|
Luke Macken |
9ab0946 |
config['pylons.app_globals'] = self.package.lib.app_globals.Globals()
|
|
Luke Macken |
9ab0946 |
g = config['pylons.app_globals']
|
|
Luke Macken |
9ab0946 |
g.dotted_filename_finder = DottedFileNameFinder()
|
|
Luke Macken |
9ab0946 |
- #config['pylons.helpers'] = self.package.lib.helpers
|
|
Luke Macken |
9ab0946 |
- #config['pylons.h'] = self.package.lib.helpers
|
|
Luke Macken |
9ab0946 |
|
|
Luke Macken |
9ab0946 |
def setup_sa_auth_backend(self):
|
|
Luke Macken |
9ab0946 |
"""This method adds sa_auth information to the config."""
|
|
Luke Macken |
9ab0946 |
|
|
Luke Macken |
9ab0946 |
if 'beaker.session.secret' not in config:
|
|
Luke Macken |
9ab0946 |
raise TGConfigError("You must provide a value for 'beaker.session.secret' If this is a project quickstarted with TG 2.0.2 or earlier \
|
|
Luke Macken |
9ab0946 |
double check that you have base_config['beaker.session.secret'] = 'mysecretsecret' in your app_cfg.py file.")
|
|
Luke Macken |
9ab0946 |
|
|
Luke Macken |
9ab0946 |
diff --git a/tg/render.py b/tg/render.py
|
|
Luke Macken |
9ab0946 |
--- a/tg/render.py
|
|
Luke Macken |
9ab0946 |
+++ b/tg/render.py
|
|
Luke Macken |
9ab0946 |
@@ -28,17 +28,17 @@ def my_pylons_globals():
|
|
Luke Macken |
9ab0946 |
|
|
Luke Macken |
9ab0946 |
"""
|
|
Luke Macken |
9ab0946 |
|
|
Luke Macken |
9ab0946 |
conf = pylons.config._current_obj()
|
|
Luke Macken |
9ab0946 |
c = pylons.tmpl_context._current_obj()
|
|
Luke Macken |
9ab0946 |
g = conf.get('pylons.app_globals') or conf['pylons.g']
|
|
Luke Macken |
9ab0946 |
|
|
Luke Macken |
9ab0946 |
try:
|
|
Luke Macken |
9ab0946 |
- h = config.get('pylons.package').lib.helpers
|
|
Luke Macken |
9ab0946 |
+ h = conf.package.lib.helpers
|
|
Luke Macken |
9ab0946 |
|
|
Luke Macken |
9ab0946 |
except (AttributeError, KeyError):
|
|
Luke Macken |
9ab0946 |
h = Bunch()
|
|
Luke Macken |
9ab0946 |
|
|
Luke Macken |
9ab0946 |
pylons_vars = dict(
|
|
Luke Macken |
9ab0946 |
c=c,
|
|
Luke Macken |
9ab0946 |
tmpl_context=c,
|
|
Luke Macken |
9ab0946 |
config=conf,
|
|
Luke Macken |
9ab0946 |
@@ -149,31 +149,29 @@ def _get_tg_vars():
|
|
Luke Macken |
9ab0946 |
locale = tg.request.accept_language.best_matches(),
|
|
Luke Macken |
9ab0946 |
errors = getattr(tmpl_context, "form_errors", {}),
|
|
Luke Macken |
9ab0946 |
inputs = getattr(tmpl_context, "form_values", {}),
|
|
Luke Macken |
9ab0946 |
request = tg.request,
|
|
Luke Macken |
9ab0946 |
auth_stack_enabled = 'repoze.who.plugins' in tg.request.environ,
|
|
Luke Macken |
9ab0946 |
predicates = predicates,
|
|
Luke Macken |
9ab0946 |
)
|
|
Luke Macken |
9ab0946 |
|
|
Luke Macken |
9ab0946 |
- # TODO in 2.2: we should actually just get helpers from the package's helpers
|
|
Luke Macken |
9ab0946 |
- # module and dump the use of the SOP.
|
|
Luke Macken |
9ab0946 |
-
|
|
Luke Macken |
9ab0946 |
try:
|
|
Luke Macken |
9ab0946 |
- helpers = config['pylons.package'].lib.helpers
|
|
Luke Macken |
9ab0946 |
+ h = config.package.lib.helpers
|
|
Luke Macken |
9ab0946 |
except AttributeError, ImportError:
|
|
Luke Macken |
9ab0946 |
- helpers = Bunch()
|
|
Luke Macken |
9ab0946 |
+ h = Bunch()
|
|
Luke Macken |
9ab0946 |
|
|
Luke Macken |
9ab0946 |
root_vars = Bunch(
|
|
Luke Macken |
9ab0946 |
c = tmpl_context,
|
|
Luke Macken |
9ab0946 |
tmpl_context = tmpl_context,
|
|
Luke Macken |
9ab0946 |
response = response,
|
|
Luke Macken |
9ab0946 |
request = request,
|
|
Luke Macken |
9ab0946 |
url = tg.url,
|
|
Luke Macken |
9ab0946 |
- helpers = helpers,
|
|
Luke Macken |
9ab0946 |
+ helpers = h,
|
|
Luke Macken |
9ab0946 |
+ h = h,
|
|
Luke Macken |
9ab0946 |
tg = tg_vars
|
|
Luke Macken |
9ab0946 |
)
|
|
Luke Macken |
9ab0946 |
#Allow users to provide a callable that defines extra vars to be
|
|
Luke Macken |
9ab0946 |
#added to the template namespace
|
|
Luke Macken |
9ab0946 |
variable_provider = config.get('variable_provider', None)
|
|
Luke Macken |
9ab0946 |
if variable_provider:
|
|
Luke Macken |
9ab0946 |
root_vars.update(variable_provider())
|
|
Luke Macken |
9ab0946 |
return root_vars
|