Merged in jchappell82/coverage.py/issue361 (pull request #45)

author: Ned Batchelder <ned@nedbatchelder.com> 2015-04-15 21:07:00 -0400
committer: Ned Batchelder <ned@nedbatchelder.com> 2015-04-15 21:07:00 -0400
commit: 1a71ab66a110e7aadae714061a8010b2392678cc (patch)
tree: a38dec3ea898adcf2df66a00f089e0dc44ef31d3
parent: 14a1556283d6e854b312baa0a172719287ff2519 (diff)
parent: 96e475bbac00c650dd595961376fe1a78a160208 (diff)
download: python-coveragepy-1a71ab66a110e7aadae714061a8010b2392678cc.tar.gz
13 files changed, 129 insertions, 129 deletions
diff --git a/coverage/html.py b/coverage/html.py
index 9628216..8ed085b 100644
--- a/coverage/html.py
+++ b/coverage/html.py
@@ -221,7 +221,7 @@ class HtmlReporter(Reporter):
                 else:
                     tok_html = escape(tok_text) or '&nbsp;'
                     html.append(
-                        "<span class='%s'>%s</span>" % (tok_type, tok_html)
+                        '<span class="%s">%s</span>' % (tok_type, tok_html)
                         )
 
             lines.append({
diff --git a/coverage/htmlfiles/index.html b/coverage/htmlfiles/index.html
index 90802c8..5242d32 100644
--- a/coverage/htmlfiles/index.html
+++ b/coverage/htmlfiles/index.html
@@ -1,30 +1,30 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <meta http-equiv='Content-Type' content='text/html; charset=utf-8'>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
     <title>{{ title|escape }}</title>
-    <link rel='stylesheet' href='style.css' type='text/css'>
+    <link rel="stylesheet" href="style.css" type="text/css">
     {% if extra_css %}
-        <link rel='stylesheet' href='{{ extra_css }}' type='text/css'>
+        <link rel="stylesheet" href="{{ extra_css }}" type="text/css">
     {% endif %}
-    <script type='text/javascript' src='jquery.min.js'></script>
-    <script type='text/javascript' src='jquery.debounce.min.js'></script>
-    <script type='text/javascript' src='jquery.tablesorter.min.js'></script>
-    <script type='text/javascript' src='jquery.hotkeys.js'></script>
-    <script type='text/javascript' src='coverage_html.js'></script>
-    <script type='text/javascript'>
+    <script type="text/javascript" src="jquery.min.js"></script>
+    <script type="text/javascript" src="jquery.debounce.min.js"></script>
+    <script type="text/javascript" src="jquery.tablesorter.min.js"></script>
+    <script type="text/javascript" src="jquery.hotkeys.js"></script>
+    <script type="text/javascript" src="coverage_html.js"></script>
+    <script type="text/javascript">
         jQuery(document).ready(coverage.index_ready);
     </script>
 </head>
-<body class='indexfile'>
+<body class="indexfile">
 
-<div id='header'>
-    <div class='content'>
+<div id="header">
+    <div class="content">
         <h1>{{ title|escape }}:
-            <span class='pc_cov'>{{totals.pc_covered_str}}%</span>
+            <span class="pc_cov">{{totals.pc_covered_str}}%</span>
         </h1>
 
-        <img id='keyboard_icon' src='keybd_closed.png' alt='Show keyboard shortcuts' />
+        <img id="keyboard_icon" src="keybd_closed.png" alt="Show keyboard shortcuts" />
 
         <form id="filter_container">
             <input id="filter" type="text" value="" placeholder="filter..." />
@@ -32,44 +32,44 @@
     </div>
 </div>
 
-<div class='help_panel'>
-    <img id='panel_icon' src='keybd_open.png' alt='Hide keyboard shortcuts' />
-    <p class='legend'>Hot-keys on this page</p>
+<div class="help_panel">
+    <img id="panel_icon" src="keybd_open.png" alt="Hide keyboard shortcuts" />
+    <p class="legend">Hot-keys on this page</p>
     <div>
-    <p class='keyhelp'>
-        <span class='key'>n</span>
-        <span class='key'>s</span>
-        <span class='key'>m</span>
-        <span class='key'>x</span>
+    <p class="keyhelp">
+        <span class="key">n</span>
+        <span class="key">s</span>
+        <span class="key">m</span>
+        <span class="key">x</span>
         {% if arcs %}
-        <span class='key'>b</span>
-        <span class='key'>p</span>
+        <span class="key">b</span>
+        <span class="key">p</span>
         {% endif %}
-        <span class='key'>c</span> &nbsp; change column sorting
+        <span class="key">c</span> &nbsp; change column sorting
     </p>
     </div>
 </div>
 
-<div id='index'>
-    <table class='index'>
+<div id="index">
+    <table class="index">
         <thead>
-            {# The title='' attr doesn't work in Safari. #}
-            <tr class='tablehead' title='Click to sort'>
-                <th class='name left headerSortDown shortkey_n'>Module</th>
-                <th class='shortkey_s'>statements</th>
-                <th class='shortkey_m'>missing</th>
-                <th class='shortkey_x'>excluded</th>
+            {# The title="" attr doesn"t work in Safari. #}
+            <tr class="tablehead" title="Click to sort">
+                <th class="name left headerSortDown shortkey_n">Module</th>
+                <th class="shortkey_s">statements</th>
+                <th class="shortkey_m">missing</th>
+                <th class="shortkey_x">excluded</th>
                 {% if arcs %}
-                <th class='shortkey_b'>branches</th>
-                <th class='shortkey_p'>partial</th>
+                <th class="shortkey_b">branches</th>
+                <th class="shortkey_p">partial</th>
                 {% endif %}
-                <th class='right shortkey_c'>coverage</th>
+                <th class="right shortkey_c">coverage</th>
             </tr>
         </thead>
         {# HTML syntax requires thead, tfoot, tbody #}
         <tfoot>
-            <tr class='total'>
-                <td class='name left'>Total</td>
+            <tr class="total">
+                <td class="name left">Total</td>
                 <td>{{totals.n_statements}}</td>
                 <td>{{totals.n_missing}}</td>
                 <td>{{totals.n_excluded}}</td>
@@ -77,13 +77,13 @@
                 <td>{{totals.n_branches}}</td>
                 <td>{{totals.n_partial_branches}}</td>
                 {% endif %}
-                <td class='right' data-ratio='{{totals.ratio_covered|pair}}'>{{totals.pc_covered_str}}%</td>
+                <td class="right" data-ratio="{{totals.ratio_covered|pair}}">{{totals.pc_covered_str}}%</td>
             </tr>
         </tfoot>
         <tbody>
             {% for file in files %}
-            <tr class='file'>
-                <td class='name left'><a href='{{file.html_filename}}'>{{file.name}}</a></td>
+            <tr class="file">
+                <td class="name left"><a href="{{file.html_filename}}">{{file.name}}</a></td>
                 <td>{{file.nums.n_statements}}</td>
                 <td>{{file.nums.n_missing}}</td>
                 <td>{{file.nums.n_excluded}}</td>
@@ -91,7 +91,7 @@
                 <td>{{file.nums.n_branches}}</td>
                 <td>{{file.nums.n_partial_branches}}</td>
                 {% endif %}
-                <td class='right' data-ratio='{{file.nums.ratio_covered|pair}}'>{{file.nums.pc_covered_str}}%</td>
+                <td class="right" data-ratio="{{file.nums.ratio_covered|pair}}">{{file.nums.pc_covered_str}}%</td>
             </tr>
             {% endfor %}
         </tbody>
@@ -102,10 +102,10 @@
     </p>
 </div>
 
-<div id='footer'>
-    <div class='content'>
+<div id="footer">
+    <div class="content">
         <p>
-            <a class='nav' href='{{__url__}}'>coverage.py v{{__version__}}</a>
+            <a class="nav" href="{{__url__}}">coverage.py v{{__version__}}</a>
         </p>
     </div>
 </div>
diff --git a/coverage/htmlfiles/pyfile.html b/coverage/htmlfiles/pyfile.html
index f9d898a..72b6928 100644
--- a/coverage/htmlfiles/pyfile.html
+++ b/coverage/htmlfiles/pyfile.html
@@ -1,90 +1,90 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <meta http-equiv='Content-Type' content='text/html; charset=utf-8'>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
     {# IE8 rounds line-height incorrectly, and adding this emulateIE7 line makes it right! #}
     {# http://social.msdn.microsoft.com/Forums/en-US/iewebdevelopment/thread/7684445e-f080-4d8f-8529-132763348e21 #}
-    <meta http-equiv='X-UA-Compatible' content='IE=emulateIE7' />
+    <meta http-equiv="X-UA-Compatible" content="IE=emulateIE7" />
     <title>Coverage for {{fr.name|escape}}: {{nums.pc_covered_str}}%</title>
-    <link rel='stylesheet' href='style.css' type='text/css'>
+    <link rel="stylesheet" href="style.css" type="text/css">
     {% if extra_css %}
-        <link rel='stylesheet' href='{{ extra_css }}' type='text/css'>
+        <link rel="stylesheet" href="{{ extra_css }}" type="text/css">
     {% endif %}
-    <script type='text/javascript' src='jquery.min.js'></script>
-    <script type='text/javascript' src='jquery.hotkeys.js'></script>
-    <script type='text/javascript' src='jquery.isonscreen.js'></script>
-    <script type='text/javascript' src='coverage_html.js'></script>
-    <script type='text/javascript'>
+    <script type="text/javascript" src="jquery.min.js"></script>
+    <script type="text/javascript" src="jquery.hotkeys.js"></script>
+    <script type="text/javascript" src="jquery.isonscreen.js"></script>
+    <script type="text/javascript" src="coverage_html.js"></script>
+    <script type="text/javascript">
         jQuery(document).ready(coverage.pyfile_ready);
     </script>
 </head>
-<body class='pyfile'>
+<body class="pyfile">
 
-<div id='header'>
-    <div class='content'>
+<div id="header">
+    <div class="content">
         <h1>Coverage for <b>{{fr.name|escape}}</b> :
-            <span class='pc_cov'>{{nums.pc_covered_str}}%</span>
+            <span class="pc_cov">{{nums.pc_covered_str}}%</span>
         </h1>
 
-        <img id='keyboard_icon' src='keybd_closed.png' alt='Show keyboard shortcuts' />
+        <img id="keyboard_icon" src="keybd_closed.png" alt="Show keyboard shortcuts" />
 
-        <h2 class='stats'>
+        <h2 class="stats">
             {{nums.n_statements}} statements &nbsp;
-            <span class='{{c_run}} shortkey_r button_toggle_run'>{{nums.n_executed}} run</span>
-            <span class='{{c_mis}} shortkey_m button_toggle_mis'>{{nums.n_missing}} missing</span>
-            <span class='{{c_exc}} shortkey_x button_toggle_exc'>{{nums.n_excluded}} excluded</span>
+            <span class="{{c_run}} shortkey_r button_toggle_run">{{nums.n_executed}} run</span>
+            <span class="{{c_mis}} shortkey_m button_toggle_mis">{{nums.n_missing}} missing</span>
+            <span class="{{c_exc}} shortkey_x button_toggle_exc">{{nums.n_excluded}} excluded</span>
 
             {% if arcs %}
-                <span class='{{c_par}} shortkey_p button_toggle_par'>{{nums.n_partial_branches}} partial</span>
+                <span class="{{c_par}} shortkey_p button_toggle_par">{{nums.n_partial_branches}} partial</span>
             {% endif %}
         </h2>
     </div>
 </div>
 
-<div class='help_panel'>
-    <img id='panel_icon' src='keybd_open.png' alt='Hide keyboard shortcuts' />
-    <p class='legend'>Hot-keys on this page</p>
+<div class="help_panel">
+    <img id="panel_icon" src="keybd_open.png" alt="Hide keyboard shortcuts" />
+    <p class="legend">Hot-keys on this page</p>
     <div>
-    <p class='keyhelp'>
-        <span class='key'>r</span>
-        <span class='key'>m</span>
-        <span class='key'>x</span>
-        <span class='key'>p</span> &nbsp; toggle line displays
+    <p class="keyhelp">
+        <span class="key">r</span>
+        <span class="key">m</span>
+        <span class="key">x</span>
+        <span class="key">p</span> &nbsp; toggle line displays
     </p>
-    <p class='keyhelp'>
-        <span class='key'>j</span>
-        <span class='key'>k</span> &nbsp; next/prev highlighted chunk
+    <p class="keyhelp">
+        <span class="key">j</span>
+        <span class="key">k</span> &nbsp; next/prev highlighted chunk
     </p>
-    <p class='keyhelp'>
-        <span class='key'>0</span> &nbsp; (zero) top of page
+    <p class="keyhelp">
+        <span class="key">0</span> &nbsp; (zero) top of page
     </p>
-    <p class='keyhelp'>
-        <span class='key'>1</span> &nbsp; (one) first highlighted chunk
+    <p class="keyhelp">
+        <span class="key">1</span> &nbsp; (one) first highlighted chunk
     </p>
     </div>
 </div>
 
-<div id='source'>
+<div id="source">
     <table>
         <tr>
-            <td class='linenos'>
+            <td class="linenos">
                 {% for line in lines %}
-                    <p id='n{{line.number}}' class='{{line.class}}'><a href='#n{{line.number}}'>{{line.number}}</a></p>
+                    <p id="n{{line.number}}" class="{{line.class}}"><a href="#n{{line.number}}">{{line.number}}</a></p>
                 {% endfor %}
             </td>
-            <td class='text'>
+            <td class="text">
                 {% for line in lines %}
-                    <p id='t{{line.number}}' class='{{line.class}}'>{% if line.annotate %}<span class='annotate' title='{{line.annotate_title}}'>{{line.annotate}}</span>{% endif %}{{line.html}}<span class='strut'>&nbsp;</span></p>
+                    <p id="t{{line.number}}" class="{{line.class}}">{% if line.annotate %}<span class="annotate" title="{{line.annotate_title}}">{{line.annotate}}</span>{% endif %}{{line.html}}<span class="strut">&nbsp;</span></p>
                 {% endfor %}
             </td>
         </tr>
     </table>
 </div>
 
-<div id='footer'>
-    <div class='content'>
+<div id="footer">
+    <div class="content">
         <p>
-            <a class='nav' href='index.html'>&#xab; index</a> &nbsp; &nbsp; <a class='nav' href='{{__url__}}'>coverage.py v{{__version__}}</a>
+            <a class="nav" href="index.html">&#xab; index</a> &nbsp; &nbsp; <a class="nav" href="{{__url__}}">coverage.py v{{__version__}}</a>
         </p>
     </div>
 </div>
diff --git a/coverage/templite.py b/coverage/templite.py
index c102a8f..9f882cf 100644
--- a/coverage/templite.py
+++ b/coverage/templite.py
@@ -201,7 +201,7 @@ class Templite(object):
         for var_name in self.all_vars - self.loop_vars:
             vars_code.add_line("c_%s = context[%r]" % (var_name, var_name))
 
-        code.add_line("return ''.join(result)")
+        code.add_line('return "".join(result)')
         code.dedent()
         self._render_function = code.get_globals()['render_function']
 
diff --git a/tests/farm/html/run_a.py b/tests/farm/html/run_a.py
index 7963d2e..f510e11 100644
--- a/tests/farm/html/run_a.py
+++ b/tests/farm/html/run_a.py
@@ -13,14 +13,14 @@ runfunc(html_it, rundir="src")
 #   and check that certain key strings are in the output.
 compare("gold_a", "html_a", size_within=10, file_pattern="*.html")
 contains("html_a/a_py.html",
-    "<span class='key'>if</span> <span class='num'>1</span> <span class='op'>&lt;</span> <span class='num'>2</span>",
-    "&nbsp; &nbsp; <span class='nam'>a</span> <span class='op'>=</span> <span class='num'>3</span>",
-    "<span class='pc_cov'>67%</span>"
+    '<span class="key">if</span> <span class="num">1</span> <span class="op">&lt;</span> <span class="num">2</span>',
+    '&nbsp; &nbsp; <span class="nam">a</span> <span class="op">=</span> <span class="num">3</span>',
+    '<span class="pc_cov">67%</span>'
     )
 contains("html_a/index.html",
-    "<a href='a_py.html'>a.py</a>",
-    "<span class='pc_cov'>67%</span>",
-    "<td class='right' data-ratio='2 3'>67%</td>",
+    '<a href="a_py.html">a.py</a>',
+    '<span class="pc_cov">67%</span>',
+    '<td class="right" data-ratio="2 3">67%</td>',
     )
 
 clean("html_a")
diff --git a/tests/farm/html/run_b_branch.py b/tests/farm/html/run_b_branch.py
index c92252c..388b5c5 100644
--- a/tests/farm/html/run_b_branch.py
+++ b/tests/farm/html/run_b_branch.py
@@ -13,17 +13,17 @@ runfunc(html_it, rundir="src")
 #   and check that certain key strings are in the output.
 compare("gold_b_branch", "html_b_branch", size_within=10, file_pattern="*.html")
 contains("html_b_branch/b_py.html",
-    "<span class='key'>if</span> <span class='nam'>x</span> <span class='op'>&lt;</span> <span class='num'>2</span>",
-    "&nbsp; &nbsp; <span class='nam'>a</span> <span class='op'>=</span> <span class='num'>3</span>",
-    "<span class='pc_cov'>70%</span>",
-    "<span class='annotate' title='no jump to this line number'>8</span>",
-    "<span class='annotate' title='no jump to this line number'>exit</span>",
-    "<span class='annotate' title='no jumps to these line numbers'>23&nbsp;&nbsp; 25</span>",
+    '<span class="key">if</span> <span class="nam">x</span> <span class="op">&lt;</span> <span class="num">2</span>',
+    '&nbsp; &nbsp; <span class="nam">a</span> <span class="op">=</span> <span class="num">3</span>',
+    '<span class="pc_cov">70%</span>',
+    '<span class="annotate" title="no jump to this line number">8</span>',
+    '<span class="annotate" title="no jump to this line number">exit</span>',
+    '<span class="annotate" title="no jumps to these line numbers">23&nbsp;&nbsp; 25</span>',
     )
 contains("html_b_branch/index.html",
-    "<a href='b_py.html'>b.py</a>",
-    "<span class='pc_cov'>70%</span>",
-    "<td class='right' data-ratio='16 23'>70%</td>",
+    '<a href="b_py.html">b.py</a>',
+    '<span class="pc_cov">70%</span>',
+    '<td class="right" data-ratio="16 23">70%</td>',
     )
 
 clean("html_b_branch")
diff --git a/tests/farm/html/run_bom.py b/tests/farm/html/run_bom.py
index 9694975..a6e6d8b 100644
--- a/tests/farm/html/run_bom.py
+++ b/tests/farm/html/run_bom.py
@@ -15,7 +15,7 @@ runfunc(html_it, rundir="src")
 #   and check that certain key strings are in the output.
 compare("gold_bom", "html_bom", size_within=10, file_pattern="*.html")
 contains("html_bom/bom_py.html",
-    "<span class='str'>&quot;3&#215;4 = 12, &#247;2 = 6&#177;0&quot;</span>",
+    '<span class="str">&quot;3&#215;4 = 12, &#247;2 = 6&#177;0&quot;</span>',
     )
 
 clean("html_bom")
diff --git a/tests/farm/html/run_isolatin1.py b/tests/farm/html/run_isolatin1.py
index bf3746d..b03cd25 100644
--- a/tests/farm/html/run_isolatin1.py
+++ b/tests/farm/html/run_isolatin1.py
@@ -15,7 +15,7 @@ runfunc(html_it, rundir="src")
 #   and check that certain key strings are in the output.
 compare("gold_isolatin1", "html_isolatin1", size_within=10, file_pattern="*.html")
 contains("html_isolatin1/isolatin1_py.html",
-    "<span class='str'>&quot;3&#215;4 = 12, &#247;2 = 6&#177;0&quot;</span>",
+    '<span class="str">&quot;3&#215;4 = 12, &#247;2 = 6&#177;0&quot;</span>',
     )
 
 clean("html_isolatin1")
diff --git a/tests/farm/html/run_other.py b/tests/farm/html/run_other.py
index 05efa0f..7c7f344 100644
--- a/tests/farm/html/run_other.py
+++ b/tests/farm/html/run_other.py
@@ -19,8 +19,8 @@ for p in glob.glob("html_other/*_other_py.html"):
 #   and check that certain key strings are in the output.
 compare("gold_other", "html_other", size_within=10, file_pattern="*.html")
 contains("html_other/index.html",
-    "<a href='here_py.html'>here.py</a>",
-    "other_py.html'>", "other.py</a>",
+    '<a href="here_py.html">here.py</a>',
+    'other_py.html">', 'other.py</a>',
     )
 
 clean("html_other")
diff --git a/tests/farm/html/run_partial.py b/tests/farm/html/run_partial.py
index 3879079..7330bb2 100644
--- a/tests/farm/html/run_partial.py
+++ b/tests/farm/html/run_partial.py
@@ -15,17 +15,17 @@ runfunc(html_it, rundir="src")
 #   and check that certain key strings are in the output.
 compare("gold_partial", "html_partial", size_within=10, file_pattern="*.html")
 contains("html_partial/partial_py.html",
-    "<p id='t5' class='stm run hide_run'>",
-    "<p id='t8' class='stm run hide_run'>",
-    "<p id='t11' class='stm run hide_run'>",
+    '<p id="t5" class="stm run hide_run">',
+    '<p id="t8" class="stm run hide_run">',
+    '<p id="t11" class="stm run hide_run">',
     # The "if 0" and "if 1" statements are optimized away.
-    "<p id='t14' class='pln'>",
+    '<p id="t14" class="pln">',
     )
 contains("html_partial/index.html",
-    "<a href='partial_py.html'>partial.py</a>",
+    '<a href="partial_py.html">partial.py</a>',
     )
 contains("html_partial/index.html",
-    "<span class='pc_cov'>100%</span>"
+    '<span class="pc_cov">100%</span>'
     )
 
 clean("html_partial")
diff --git a/tests/farm/html/run_styled.py b/tests/farm/html/run_styled.py
index a18096a..ebfbf3b 100644
--- a/tests/farm/html/run_styled.py
+++ b/tests/farm/html/run_styled.py
@@ -14,15 +14,15 @@ runfunc(html_it, rundir="src")
 compare("gold_styled", "html_styled", size_within=10, file_pattern="*.html")
 compare("gold_styled", "html_styled", size_within=10, file_pattern="*.css")
 contains("html_styled/a_py.html",
-    "<link rel='stylesheet' href='extra.css' type='text/css'>",
-    "<span class='key'>if</span> <span class='num'>1</span> <span class='op'>&lt;</span> <span class='num'>2</span>",
-    "&nbsp; &nbsp; <span class='nam'>a</span> <span class='op'>=</span> <span class='num'>3</span>",
-    "<span class='pc_cov'>67%</span>"
+    '<link rel="stylesheet" href="extra.css" type="text/css">',
+    '<span class="key">if</span> <span class="num">1</span> <span class="op">&lt;</span> <span class="num">2</span>',
+    '&nbsp; &nbsp; <span class="nam">a</span> <span class="op">=</span> <span class="num">3</span>',
+    '<span class="pc_cov">67%</span>'
     )
 contains("html_styled/index.html",
-    "<link rel='stylesheet' href='extra.css' type='text/css'>",
-    "<a href='a_py.html'>a.py</a>",
-    "<span class='pc_cov'>67%</span>"
+    '<link rel="stylesheet" href="extra.css" type="text/css">',
+    '<a href="a_py.html">a.py</a>',
+    '<span class="pc_cov">67%</span>'
     )
 
 clean("html_styled")
diff --git a/tests/farm/html/run_tabbed.py b/tests/farm/html/run_tabbed.py
index 679db2e..3e8a900 100644
--- a/tests/farm/html/run_tabbed.py
+++ b/tests/farm/html/run_tabbed.py
@@ -13,11 +13,11 @@ runfunc(html_it, rundir="src")
 contains("src/tabbed.py", "\tif x:\t\t\t\t\t# look nice")
 
 contains("html_tabbed/tabbed_py.html",
-    ">&nbsp; &nbsp; &nbsp; &nbsp; <span class='key'>if</span> "
-    "<span class='nam'>x</span><span class='op'>:</span>"
-    "&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; "
-    "&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;&nbsp; "
-    "<span class='com'># look nice</span>"
+    '>&nbsp; &nbsp; &nbsp; &nbsp; <span class="key">if</span> '
+    '<span class="nam">x</span><span class="op">:</span>'
+    '&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; '
+    '&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;&nbsp; '
+    '<span class="com"># look nice</span>'
     )
 
 doesnt_contain("html_tabbed/tabbed_py.html", "\t")
diff --git a/tests/farm/html/run_unicode.py b/tests/farm/html/run_unicode.py
index ba34f63..455d016 100644
--- a/tests/farm/html/run_unicode.py
+++ b/tests/farm/html/run_unicode.py
@@ -13,12 +13,12 @@ runfunc(html_it, rundir="src")
 #   and check that certain key strings are in the output.
 compare("gold_unicode", "html_unicode", size_within=10, file_pattern="*.html")
 contains("html_unicode/unicode_py.html",
-    "<span class='str'>&quot;&#654;d&#729;&#477;b&#592;&#633;&#477;&#652;o&#596;&quot;</span>",
+    '<span class="str">&quot;&#654;d&#729;&#477;b&#592;&#633;&#477;&#652;o&#596;&quot;</span>',
     )
 
 contains_any("html_unicode/unicode_py.html",
-    "<span class='str'>&quot;db40,dd00: x&#56128;&#56576;&quot;</span>",
-    "<span class='str'>&quot;db40,dd00: x&#917760;&quot;</span>",
+    '<span class="str">&quot;db40,dd00: x&#56128;&#56576;&quot;</span>',
+    '<span class="str">&quot;db40,dd00: x&#917760;&quot;</span>',
     )
 
 clean("html_unicode")
author	Ned Batchelder <ned@nedbatchelder.com>	2015-04-15 21:07:00 -0400
committer	Ned Batchelder <ned@nedbatchelder.com>	2015-04-15 21:07:00 -0400
commit	1a71ab66a110e7aadae714061a8010b2392678cc (patch)
tree	a38dec3ea898adcf2df66a00f089e0dc44ef31d3
parent	14a1556283d6e854b312baa0a172719287ff2519 (diff)
parent	96e475bbac00c650dd595961376fe1a78a160208 (diff)
download	python-coveragepy-1a71ab66a110e7aadae714061a8010b2392678cc.tar.gz