From: Ben Darnell <ben@bendarnell.com>
Date: Wed, 3 Aug 2011 06:58:41 +0000 (-0700)
Subject: Fix style, add comments
X-Git-Tag: v2.1.0~58
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ef95c11fb05b1af85c24f58f809344380f9fc8da;p=thirdparty%2Ftornado.git

Fix style, add comments
---

diff --git a/tornado/web.py b/tornado/web.py
index a454cfc72..41f34e975 100644
--- a/tornado/web.py
+++ b/tornado/web.py
@@ -106,8 +106,14 @@ 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"] = self.ui["_modules"] = _O((n, self._ui_module(n, m)) for n, m in
-                                                      application.ui_modules.iteritems())
+        # UIModules are available as both `modules` and `_modules` in the
+        # template namespace.  Historically only `modules` was available
+        # but could be clobbered by user additions to the namespace.
+        # The template {% module %} directive looks in `_modules` to avoid
+        # possible conflicts.
+        self.ui["_modules"] = _O((n, self._ui_module(n, m)) for n, m in
+                                 application.ui_modules.iteritems())
+        self.ui["modules"] = self.ui["_modules"]
         self.clear()
         # Check since connection is not available in WSGI
         if hasattr(self.request, "connection"):