From: Bret Taylor <btaylor@gmail.com>
Date: Fri, 2 Oct 2009 03:41:29 +0000 (-0700)
Subject: Fix embedded CSS bug
X-Git-Tag: v1.0.0~101
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4e0a8433d9519a78fa255a1f76a01100bcc8ae43;p=thirdparty%2Ftornado.git

Fix embedded CSS bug
---

diff --git a/tornado/web.py b/tornado/web.py
index 48db9ffa3..d77f0c566 100644
--- a/tornado/web.py
+++ b/tornado/web.py
@@ -332,16 +332,16 @@ class RequestHandler(object):
                     paths.add(self.static_url(path))
                 else:
                     paths.add(path)
-            js_embed = ''.join('<script src="' + escape.xhtml_escape(p) +
-                                 '" type="text/javascript"></script>'
-                                 for p in paths)
+            js = ''.join('<script src="' + escape.xhtml_escape(p) +
+                         '" type="text/javascript"></script>'
+                         for p in paths)
             sloc = html.rindex('</body>')
-            html = html[:sloc] + js_embed + '\n' + html[sloc:]
+            html = html[:sloc] + js + '\n' + html[sloc:]
         if js_embed:
-            js_embed = '<script type="text/javascript">\n//<![CDATA[\n' + \
+            js = '<script type="text/javascript">\n//<![CDATA[\n' + \
                 '\n'.join(js_embed) + '\n//]]>\n</script>'
             sloc = html.rindex('</body>')
-            html = html[:sloc] + js_embed + '\n' + html[sloc:]
+            html = html[:sloc] + js + '\n' + html[sloc:]
         if css_files:
             paths = set()
             for path in css_files:
@@ -349,16 +349,16 @@ class RequestHandler(object):
                     paths.add(self.static_url(path))
                 else:
                     paths.add(path)
-            css_embed = ''.join('<link href="' + escape.xhtml_escape(p) + '" '
-                                'type="text/css" rel="stylesheet"/>'
-                                for p in paths)
+            css = ''.join('<link href="' + escape.xhtml_escape(p) + '" '
+                          'type="text/css" rel="stylesheet"/>'
+                          for p in paths)
             hloc = html.index('</head>')
-            html = html[:hloc] + css_embed + '\n' + html[hloc:]
+            html = html[:hloc] + css + '\n' + html[hloc:]
         if css_embed:
-            css_embed = '<style type="text/css">\n' + '\n'.join(css_embed) + \
+            css = '<style type="text/css">\n' + '\n'.join(css_embed) + \
                 '\n</style>'
             hloc = html.index('</head>')
-            html = html[:hloc] + css_embed + '\n' + html[hloc:]
+            html = html[:hloc] + css + '\n' + html[hloc:]
         if html_heads:
             hloc = html.index('</head>')
             html = html[:hloc] + ''.join(html_heads) + '\n' + html[hloc:]