kallithea Changeset - 33249f840ecd

Changeset - 33249f840ecd

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Mads Kiilerich - 10 years ago 2015-08-20 17:29:55
madski@unity3d.com

config: simplify some imports

1 file changed with 6 insertions and 7 deletions:

kallithea/config/environment.py

0 comments (0 inline, 0 general)

kallithea/config/environment.py

➞

Show inline comments

@@ @@ -17,15 +17,15 @@ @@
 import os
 import logging
 import kallithea
 import platform
 from mako.lookup import TemplateLookup
 from pylons.configuration import PylonsConfig
 from pylons.error import handle_mako_error
 import pylons
 import mako.lookup
 import beaker
 # don't remove this import it does magic for celery
 from kallithea.lib import celerypylons
 import kallithea.lib.app_globals as app_globals
@@ @@ -46,13 +46,13 @@ log = logging.getLogger(__name__) @@
 def load_environment(global_conf, app_conf, initial=False,
                      test_env=None, test_index=None):
     """
     Configure the Pylons environment via the ``pylons.config``
     object
     """
     config = PylonsConfig()
+    config = pylons.configuration.PylonsConfig()
     # Pylons paths
     root = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
     paths = dict(
         root=root,
         controllers=os.path.join(root, 'controllers'),
@@ @@ -72,19 +72,18 @@ def load_environment(global_conf, app_co @@
     config['pylons.h'] = helpers
     kallithea.CONFIG = config
     load_rcextensions(root_path=config['here'])
     # Setup cache object as early as possible
     import pylons
     pylons.cache._push_object(config['pylons.app_globals'].cache)
     # Create the Mako TemplateLookup, with the default auto-escaping
     config['pylons.app_globals'].mako_lookup = TemplateLookup(
+    config['pylons.app_globals'].mako_lookup = mako.lookup.TemplateLookup(
         directories=paths['templates'],
         error_handler=handle_mako_error,
+        error_handler=pylons.error.handle_mako_error,
         module_directory=os.path.join(app_conf['cache_dir'], 'templates'),
         input_encoding='utf-8', default_filters=['escape'],
         imports=['from webhelpers.html import escape'])
     # sets the c attribute access when don't existing attribute are accessed
     config['pylons.strict_tmpl_context'] = True

0 comments (0 inline, 0 general)