From: Alek Storm <alek.storm@gmail.com>
Date: Fri, 29 Jul 2011 21:02:57 +0000 (+0000)
Subject: Add extra '_modules' reference to modules list in template parameters, which is used... 
X-Git-Tag: v2.1.0~59^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a286935b2a9e753edd08badb37f859ac0c73b62b;p=thirdparty%2Ftornado.git

Add extra '_modules' reference to modules list in template parameters, which is used by {% module ... %} directive to avoid naming conflicts with Python modules named 'modules'
---

diff --git a/tornado/template.py b/tornado/template.py
index ce83a12e3..cece87e53 100644
--- 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 dc2b3ce2d..a454cfc72 100644
--- 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"):