Add extra '_modules' reference to modules list in template parameters, which is used...

diff --git a/tornado/template.py b/tornado/template.py
index ce83a12e372c1b4348a0e90915627a2aed99f7c1..cece87e53ad64ca231ff8042b13e4fd51a91e694 100644 (file)
--- a/tornado/template.py
+++ b/tornado/template.py
@@ -414,7 +414,7 @@ class _Expression(_Node):
 
 class _Module(_Expression):
     def __init__(self, expression):
-        super(_Module, self).__init__("modules." + expression,
+        super(_Module, self).__init__("_modules." + expression,
                                       raw=True)
 
 class _Text(_Node):

diff --git a/tornado/web.py b/tornado/web.py
index dc2b3ce2d91aa19f3cde33daffcfcbf2356406f9..a454cfc7228c3f46c2c0b4a0b90926ebee2c1e0c 100644 (file)
--- a/tornado/web.py
+++ b/tornado/web.py
@@ -106,8 +106,8 @@ class RequestHandler(object):
         self._transforms = None  # will be set in _execute
         self.ui = _O((n, self._ui_method(m)) for n, m in
                      application.ui_methods.iteritems())
-        self.ui["modules"] = _O((n, self._ui_module(n, m)) for n, m in
-                                application.ui_modules.iteritems())
+        self.ui["modules"] = self.ui["_modules"] = _O((n, self._ui_module(n, m)) for n, m in
+                                                      application.ui_modules.iteritems())
         self.clear()
         # Check since connection is not available in WSGI
         if hasattr(self.request, "connection"):