Remove needless license lines from html tests

author: Ned Batchelder <ned@nedbatchelder.com> 2018-08-22 12:01:34 -0400
committer: Ned Batchelder <ned@nedbatchelder.com> 2018-08-24 06:54:17 -0400
commit: c7e2de351f449132aac34228a9619b8f65360e0f (patch)
tree: 09fd1c655d8308486a6aff32f01977a728a4f593
parent: 391bd5d5fec0943bb4dbe2862308c229d4cdf84c (diff)
download: python-coveragepy-git-c7e2de351f449132aac34228a9619b8f65360e0f.tar.gz
37 files changed, 301 insertions, 507 deletions
diff --git a/tests/farm/html/gold_a/a_py.html b/tests/farm/html/gold_a/a_py.html
index 52c09526..b90583bc 100644
--- a/tests/farm/html/gold_a/a_py.html
+++ b/tests/farm/html/gold_a/a_py.html
@@ -54,28 +54,18 @@
     <table>
         <tr>
             <td class="linenos">
-<p id="n1" class="pln"><a href="#n1">1</a></p>
+<p id="n1" class="stm run hide_run"><a href="#n1">1</a></p>
 <p id="n2" class="pln"><a href="#n2">2</a></p>
-<p id="n3" class="pln"><a href="#n3">3</a></p>
+<p id="n3" class="stm run hide_run"><a href="#n3">3</a></p>
 <p id="n4" class="pln"><a href="#n4">4</a></p>
-<p id="n5" class="pln"><a href="#n5">5</a></p>
-<p id="n6" class="stm run hide_run"><a href="#n6">6</a></p>
-<p id="n7" class="pln"><a href="#n7">7</a></p>
-<p id="n8" class="stm run hide_run"><a href="#n8">8</a></p>
-<p id="n9" class="pln"><a href="#n9">9</a></p>
-<p id="n10" class="stm mis"><a href="#n10">10</a></p>
+<p id="n5" class="stm mis"><a href="#n5">5</a></p>
             </td>
             <td class="text">
-<p id="t1" class="pln"><span class="com"># Licensed under the Apache License: http://www.apache.org/licenses/LICENSE-2.0</span><span class="strut">&nbsp;</span></p>
-<p id="t2" class="pln"><span class="com"># For details: https://github.com/nedbat/coveragepy/blob/master/NOTICE.txt</span><span class="strut">&nbsp;</span></p>
-<p id="t3" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t4" class="pln"><span class="com"># A test file for HTML reporting by coverage.py.</span><span class="strut">&nbsp;</span></p>
-<p id="t5" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t6" class="stm run hide_run"><span class="key">if</span> <span class="num">1</span> <span class="op">&lt;</span> <span class="num">2</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t7" class="pln">    <span class="com"># Needed a &lt; to look at HTML entities.</span><span class="strut">&nbsp;</span></p>
-<p id="t8" class="stm run hide_run">    <span class="nam">a</span> <span class="op">=</span> <span class="num">3</span><span class="strut">&nbsp;</span></p>
-<p id="t9" class="pln"><span class="key">else</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t10" class="stm mis">    <span class="nam">a</span> <span class="op">=</span> <span class="num">4</span><span class="strut">&nbsp;</span></p>
+<p id="t1" class="stm run hide_run"><span class="key">if</span> <span class="num">1</span> <span class="op">&lt;</span> <span class="num">2</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t2" class="pln">    <span class="com"># Needed a &lt; to look at HTML entities.</span><span class="strut">&nbsp;</span></p>
+<p id="t3" class="stm run hide_run">    <span class="nam">a</span> <span class="op">=</span> <span class="num">3</span><span class="strut">&nbsp;</span></p>
+<p id="t4" class="pln"><span class="key">else</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t5" class="stm mis">    <span class="nam">a</span> <span class="op">=</span> <span class="num">4</span><span class="strut">&nbsp;</span></p>
             </td>
         </tr>
     </table>
@@ -84,7 +74,7 @@
     <div class="content">
         <p>
             <a class="nav" href="index.html">&#xab; index</a> &nbsp; &nbsp; <a class="nav" href="https://coverage.readthedocs.io/en/coverage-5.0a2">coverage.py v5.0a2</a>,
-            created at 2018-06-29 15:45
+            created at 2018-08-22 19:42
         </p>
     </div>
 </div>
diff --git a/tests/farm/html/gold_a/index.html b/tests/farm/html/gold_a/index.html
index e52d49b4..adcda2d6 100644
--- a/tests/farm/html/gold_a/index.html
+++ b/tests/farm/html/gold_a/index.html
@@ -76,7 +76,7 @@
     <div class="content">
         <p>
             <a class="nav" href="https://coverage.readthedocs.io/en/coverage-5.0a2">coverage.py v5.0a2</a>,
-            created at 2018-06-29 15:45
+            created at 2018-08-22 19:42
         </p>
     </div>
 </div>
diff --git a/tests/farm/html/gold_b_branch/b_py.html b/tests/farm/html/gold_b_branch/b_py.html
index 6c3f75a8..07250e15 100644
--- a/tests/farm/html/gold_b_branch/b_py.html
+++ b/tests/farm/html/gold_b_branch/b_py.html
@@ -55,72 +55,62 @@
     <table>
         <tr>
             <td class="linenos">
-<p id="n1" class="pln"><a href="#n1">1</a></p>
+<p id="n1" class="stm run hide_run"><a href="#n1">1</a></p>
 <p id="n2" class="pln"><a href="#n2">2</a></p>
-<p id="n3" class="pln"><a href="#n3">3</a></p>
-<p id="n4" class="pln"><a href="#n4">4</a></p>
+<p id="n3" class="stm par run hide_run"><a href="#n3">3</a></p>
+<p id="n4" class="stm run hide_run"><a href="#n4">4</a></p>
 <p id="n5" class="pln"><a href="#n5">5</a></p>
-<p id="n6" class="stm run hide_run"><a href="#n6">6</a></p>
+<p id="n6" class="stm mis"><a href="#n6">6</a></p>
 <p id="n7" class="pln"><a href="#n7">7</a></p>
-<p id="n8" class="stm par run hide_run"><a href="#n8">8</a></p>
-<p id="n9" class="stm run hide_run"><a href="#n9">9</a></p>
-<p id="n10" class="pln"><a href="#n10">10</a></p>
-<p id="n11" class="stm mis"><a href="#n11">11</a></p>
-<p id="n12" class="pln"><a href="#n12">12</a></p>
+<p id="n8" class="stm run hide_run"><a href="#n8">8</a></p>
+<p id="n9" class="pln"><a href="#n9">9</a></p>
+<p id="n10" class="stm run hide_run"><a href="#n10">10</a></p>
+<p id="n11" class="pln"><a href="#n11">11</a></p>
+<p id="n12" class="stm par run hide_run"><a href="#n12">12</a></p>
 <p id="n13" class="stm run hide_run"><a href="#n13">13</a></p>
 <p id="n14" class="pln"><a href="#n14">14</a></p>
 <p id="n15" class="stm run hide_run"><a href="#n15">15</a></p>
 <p id="n16" class="pln"><a href="#n16">16</a></p>
-<p id="n17" class="stm par run hide_run"><a href="#n17">17</a></p>
+<p id="n17" class="stm run hide_run"><a href="#n17">17</a></p>
 <p id="n18" class="stm run hide_run"><a href="#n18">18</a></p>
 <p id="n19" class="pln"><a href="#n19">19</a></p>
-<p id="n20" class="stm run hide_run"><a href="#n20">20</a></p>
-<p id="n21" class="pln"><a href="#n21">21</a></p>
-<p id="n22" class="stm run hide_run"><a href="#n22">22</a></p>
-<p id="n23" class="stm run hide_run"><a href="#n23">23</a></p>
-<p id="n24" class="pln"><a href="#n24">24</a></p>
-<p id="n25" class="stm par run hide_run"><a href="#n25">25</a></p>
-<p id="n26" class="stm mis"><a href="#n26">26</a></p>
-<p id="n27" class="pln"><a href="#n27">27</a></p>
-<p id="n28" class="stm mis"><a href="#n28">28</a></p>
-<p id="n29" class="stm run hide_run"><a href="#n29">29</a></p>
-<p id="n30" class="stm run hide_run"><a href="#n30">30</a></p>
-<p id="n31" class="pln"><a href="#n31">31</a></p>
-<p id="n32" class="stm run hide_run"><a href="#n32">32</a></p>
+<p id="n20" class="stm par run hide_run"><a href="#n20">20</a></p>
+<p id="n21" class="stm mis"><a href="#n21">21</a></p>
+<p id="n22" class="pln"><a href="#n22">22</a></p>
+<p id="n23" class="stm mis"><a href="#n23">23</a></p>
+<p id="n24" class="stm run hide_run"><a href="#n24">24</a></p>
+<p id="n25" class="stm run hide_run"><a href="#n25">25</a></p>
+<p id="n26" class="pln"><a href="#n26">26</a></p>
+<p id="n27" class="stm run hide_run"><a href="#n27">27</a></p>
             </td>
             <td class="text">
-<p id="t1" class="pln"><span class="com"># Licensed under the Apache License: http://www.apache.org/licenses/LICENSE-2.0</span><span class="strut">&nbsp;</span></p>
-<p id="t2" class="pln"><span class="com"># For details: https://github.com/nedbat/coveragepy/blob/master/NOTICE.txt</span><span class="strut">&nbsp;</span></p>
-<p id="t3" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t4" class="pln"><span class="com"># A test file for HTML reporting by coverage.py.</span><span class="strut">&nbsp;</span></p>
-<p id="t5" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t6" class="stm run hide_run"><span class="key">def</span> <span class="nam">one</span><span class="op">(</span><span class="nam">x</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t7" class="pln">    <span class="com"># This will be a branch that misses the else.</span><span class="strut">&nbsp;</span></p>
-<p id="t8" class="stm par run hide_run"><span class="annotate short">8&#x202F;&#x219B;&#x202F;11</span><span class="annotate long">line 8 didn't jump to line 11, because the condition on line 8 was never false</span>    <span class="key">if</span> <span class="nam">x</span> <span class="op">&lt;</span> <span class="num">2</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t9" class="stm run hide_run">        <span class="nam">a</span> <span class="op">=</span> <span class="num">3</span><span class="strut">&nbsp;</span></p>
-<p id="t10" class="pln">    <span class="key">else</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t11" class="stm mis">        <span class="nam">a</span> <span class="op">=</span> <span class="num">4</span><span class="strut">&nbsp;</span></p>
-<p id="t12" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t13" class="stm run hide_run"><span class="nam">one</span><span class="op">(</span><span class="num">1</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t1" class="stm run hide_run"><span class="key">def</span> <span class="nam">one</span><span class="op">(</span><span class="nam">x</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t2" class="pln">    <span class="com"># This will be a branch that misses the else.</span><span class="strut">&nbsp;</span></p>
+<p id="t3" class="stm par run hide_run"><span class="annotate short">3&#x202F;&#x219B;&#x202F;6</span><span class="annotate long">line 3 didn't jump to line 6, because the condition on line 3 was never false</span>    <span class="key">if</span> <span class="nam">x</span> <span class="op">&lt;</span> <span class="num">2</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t4" class="stm run hide_run">        <span class="nam">a</span> <span class="op">=</span> <span class="num">3</span><span class="strut">&nbsp;</span></p>
+<p id="t5" class="pln">    <span class="key">else</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t6" class="stm mis">        <span class="nam">a</span> <span class="op">=</span> <span class="num">4</span><span class="strut">&nbsp;</span></p>
+<p id="t7" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t8" class="stm run hide_run"><span class="nam">one</span><span class="op">(</span><span class="num">1</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t9" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t10" class="stm run hide_run"><span class="key">def</span> <span class="nam">two</span><span class="op">(</span><span class="nam">x</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t11" class="pln">    <span class="com"># A missed else that branches to "exit"</span><span class="strut">&nbsp;</span></p>
+<p id="t12" class="stm par run hide_run"><span class="annotate short">12&#x202F;&#x219B;&#x202F;exit</span><span class="annotate long">line 12 didn't return from function 'two', because the condition on line 12 was never false</span>    <span class="key">if</span> <span class="nam">x</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t13" class="stm run hide_run">        <span class="nam">a</span> <span class="op">=</span> <span class="num">5</span><span class="strut">&nbsp;</span></p>
 <p id="t14" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t15" class="stm run hide_run"><span class="key">def</span> <span class="nam">two</span><span class="op">(</span><span class="nam">x</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t16" class="pln">    <span class="com"># A missed else that branches to "exit"</span><span class="strut">&nbsp;</span></p>
-<p id="t17" class="stm par run hide_run"><span class="annotate short">17&#x202F;&#x219B;&#x202F;exit</span><span class="annotate long">line 17 didn't return from function 'two', because the condition on line 17 was never false</span>    <span class="key">if</span> <span class="nam">x</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t18" class="stm run hide_run">        <span class="nam">a</span> <span class="op">=</span> <span class="num">5</span><span class="strut">&nbsp;</span></p>
-<p id="t19" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t20" class="stm run hide_run"><span class="nam">two</span><span class="op">(</span><span class="num">1</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t21" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t22" class="stm run hide_run"><span class="key">def</span> <span class="nam">three</span><span class="op">(</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t23" class="stm run hide_run">    <span class="key">try</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t24" class="pln">        <span class="com"># This if has two branches, *neither* one taken.</span><span class="strut">&nbsp;</span></p>
-<p id="t25" class="stm par run hide_run"><span class="annotate short">25&#x202F;&#x219B;&#x202F;26,&nbsp;&nbsp; 25&#x202F;&#x219B;&#x202F;28</span><span class="annotate long">2 missed branches: 1) line 25 didn't jump to line 26, because the condition on line 25 was never true, 2) line 25 didn't jump to line 28, because the condition on line 25 was never false</span>        <span class="key">if</span> <span class="nam">name_error_this_variable_doesnt_exist</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t26" class="stm mis">            <span class="nam">a</span> <span class="op">=</span> <span class="num">1</span><span class="strut">&nbsp;</span></p>
-<p id="t27" class="pln">        <span class="key">else</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t28" class="stm mis">            <span class="nam">a</span> <span class="op">=</span> <span class="num">2</span><span class="strut">&nbsp;</span></p>
-<p id="t29" class="stm run hide_run">    <span class="key">except</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t30" class="stm run hide_run">        <span class="key">pass</span><span class="strut">&nbsp;</span></p>
-<p id="t31" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t32" class="stm run hide_run"><span class="nam">three</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t15" class="stm run hide_run"><span class="nam">two</span><span class="op">(</span><span class="num">1</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t16" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t17" class="stm run hide_run"><span class="key">def</span> <span class="nam">three</span><span class="op">(</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t18" class="stm run hide_run">    <span class="key">try</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t19" class="pln">        <span class="com"># This if has two branches, *neither* one taken.</span><span class="strut">&nbsp;</span></p>
+<p id="t20" class="stm par run hide_run"><span class="annotate short">20&#x202F;&#x219B;&#x202F;21,&nbsp;&nbsp; 20&#x202F;&#x219B;&#x202F;23</span><span class="annotate long">2 missed branches: 1) line 20 didn't jump to line 21, because the condition on line 20 was never true, 2) line 20 didn't jump to line 23, because the condition on line 20 was never false</span>        <span class="key">if</span> <span class="nam">name_error_this_variable_doesnt_exist</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t21" class="stm mis">            <span class="nam">a</span> <span class="op">=</span> <span class="num">1</span><span class="strut">&nbsp;</span></p>
+<p id="t22" class="pln">        <span class="key">else</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t23" class="stm mis">            <span class="nam">a</span> <span class="op">=</span> <span class="num">2</span><span class="strut">&nbsp;</span></p>
+<p id="t24" class="stm run hide_run">    <span class="key">except</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t25" class="stm run hide_run">        <span class="key">pass</span><span class="strut">&nbsp;</span></p>
+<p id="t26" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t27" class="stm run hide_run"><span class="nam">three</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
             </td>
         </tr>
     </table>
@@ -129,7 +119,7 @@
     <div class="content">
         <p>
             <a class="nav" href="index.html">&#xab; index</a> &nbsp; &nbsp; <a class="nav" href="https://coverage.readthedocs.io/en/coverage-5.0a2">coverage.py v5.0a2</a>,
-            created at 2018-06-29 15:40
+            created at 2018-08-22 19:42
         </p>
     </div>
 </div>
diff --git a/tests/farm/html/gold_b_branch/index.html b/tests/farm/html/gold_b_branch/index.html
index 844f79e1..05f882bf 100644
--- a/tests/farm/html/gold_b_branch/index.html
+++ b/tests/farm/html/gold_b_branch/index.html
@@ -84,7 +84,7 @@
     <div class="content">
         <p>
             <a class="nav" href="https://coverage.readthedocs.io/en/coverage-5.0a2">coverage.py v5.0a2</a>,
-            created at 2018-06-29 15:40
+            created at 2018-08-22 19:42
         </p>
     </div>
 </div>
diff --git a/tests/farm/html/gold_bom/bom_py.html b/tests/farm/html/gold_bom/bom_py.html
index 472f655b..92e609f8 100644
--- a/tests/farm/html/gold_bom/bom_py.html
+++ b/tests/farm/html/gold_bom/bom_py.html
@@ -55,35 +55,29 @@
         <tr>
             <td class="linenos">
 <p id="n1" class="pln"><a href="#n1">1</a></p>
-<p id="n2" class="pln"><a href="#n2">2</a></p>
+<p id="n2" class="stm run hide_run"><a href="#n2">2</a></p>
 <p id="n3" class="pln"><a href="#n3">3</a></p>
-<p id="n4" class="pln"><a href="#n4">4</a></p>
-<p id="n5" class="stm run hide_run"><a href="#n5">5</a></p>
-<p id="n6" class="pln"><a href="#n6">6</a></p>
+<p id="n4" class="stm run hide_run"><a href="#n4">4</a></p>
+<p id="n5" class="pln"><a href="#n5">5</a></p>
+<p id="n6" class="stm run hide_run"><a href="#n6">6</a></p>
 <p id="n7" class="stm run hide_run"><a href="#n7">7</a></p>
-<p id="n8" class="pln"><a href="#n8">8</a></p>
-<p id="n9" class="stm run hide_run"><a href="#n9">9</a></p>
-<p id="n10" class="stm run hide_run"><a href="#n10">10</a></p>
-<p id="n11" class="stm run hide_run"><a href="#n11">11</a></p>
-<p id="n12" class="pln"><a href="#n12">12</a></p>
-<p id="n13" class="stm mis"><a href="#n13">13</a></p>
-<p id="n14" class="stm mis"><a href="#n14">14</a></p>
+<p id="n8" class="stm run hide_run"><a href="#n8">8</a></p>
+<p id="n9" class="pln"><a href="#n9">9</a></p>
+<p id="n10" class="stm mis"><a href="#n10">10</a></p>
+<p id="n11" class="stm mis"><a href="#n11">11</a></p>
             </td>
             <td class="text">
-<p id="t1" class="pln"><span class="com"># Licensed under the Apache License: http://www.apache.org/licenses/LICENSE-2.0</span><span class="strut">&nbsp;</span></p>
-<p id="t2" class="pln"><span class="com"># For details: https://github.com/nedbat/coveragepy/blob/master/NOTICE.txt</span><span class="strut">&nbsp;</span></p>
+<p id="t1" class="pln"><span class="com"># A Python source file in utf-8, with BOM.</span><span class="strut">&nbsp;</span></p>
+<p id="t2" class="stm run hide_run"><span class="nam">math</span> <span class="op">=</span> <span class="str">"3&#215;4 = 12, &#247;2 = 6&#177;0"</span><span class="strut">&nbsp;</span></p>
 <p id="t3" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t4" class="pln"><span class="com"># A Python source file in utf-8, with BOM.</span><span class="strut">&nbsp;</span></p>
-<p id="t5" class="stm run hide_run"><span class="nam">math</span> <span class="op">=</span> <span class="str">"3&#215;4 = 12, &#247;2 = 6&#177;0"</span><span class="strut">&nbsp;</span></p>
-<p id="t6" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t7" class="stm run hide_run"><span class="key">import</span> <span class="nam">sys</span><span class="strut">&nbsp;</span></p>
-<p id="t8" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t9" class="stm run hide_run"><span class="key">if</span> <span class="nam">sys</span><span class="op">.</span><span class="nam">version_info</span> <span class="op">>=</span> <span class="op">(</span><span class="num">3</span><span class="op">,</span> <span class="num">0</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t10" class="stm run hide_run">    <span class="key">assert</span> <span class="nam">len</span><span class="op">(</span><span class="nam">math</span><span class="op">)</span> <span class="op">==</span> <span class="num">18</span><span class="strut">&nbsp;</span></p>
-<p id="t11" class="stm run hide_run">    <span class="key">assert</span> <span class="nam">len</span><span class="op">(</span><span class="nam">math</span><span class="op">.</span><span class="nam">encode</span><span class="op">(</span><span class="str">'utf-8'</span><span class="op">)</span><span class="op">)</span> <span class="op">==</span> <span class="num">21</span><span class="strut">&nbsp;</span></p>
-<p id="t12" class="pln"><span class="key">else</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t13" class="stm mis">    <span class="key">assert</span> <span class="nam">len</span><span class="op">(</span><span class="nam">math</span><span class="op">)</span> <span class="op">==</span> <span class="num">21</span><span class="strut">&nbsp;</span></p>
-<p id="t14" class="stm mis">    <span class="key">assert</span> <span class="nam">len</span><span class="op">(</span><span class="nam">math</span><span class="op">.</span><span class="nam">decode</span><span class="op">(</span><span class="str">'utf-8'</span><span class="op">)</span><span class="op">)</span> <span class="op">==</span> <span class="num">18</span><span class="strut">&nbsp;</span></p>
+<p id="t4" class="stm run hide_run"><span class="key">import</span> <span class="nam">sys</span><span class="strut">&nbsp;</span></p>
+<p id="t5" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t6" class="stm run hide_run"><span class="key">if</span> <span class="nam">sys</span><span class="op">.</span><span class="nam">version_info</span> <span class="op">>=</span> <span class="op">(</span><span class="num">3</span><span class="op">,</span> <span class="num">0</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t7" class="stm run hide_run">    <span class="key">assert</span> <span class="nam">len</span><span class="op">(</span><span class="nam">math</span><span class="op">)</span> <span class="op">==</span> <span class="num">18</span><span class="strut">&nbsp;</span></p>
+<p id="t8" class="stm run hide_run">    <span class="key">assert</span> <span class="nam">len</span><span class="op">(</span><span class="nam">math</span><span class="op">.</span><span class="nam">encode</span><span class="op">(</span><span class="str">'utf-8'</span><span class="op">)</span><span class="op">)</span> <span class="op">==</span> <span class="num">21</span><span class="strut">&nbsp;</span></p>
+<p id="t9" class="pln"><span class="key">else</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t10" class="stm mis">    <span class="key">assert</span> <span class="nam">len</span><span class="op">(</span><span class="nam">math</span><span class="op">)</span> <span class="op">==</span> <span class="num">21</span><span class="strut">&nbsp;</span></p>
+<p id="t11" class="stm mis">    <span class="key">assert</span> <span class="nam">len</span><span class="op">(</span><span class="nam">math</span><span class="op">.</span><span class="nam">decode</span><span class="op">(</span><span class="str">'utf-8'</span><span class="op">)</span><span class="op">)</span> <span class="op">==</span> <span class="num">18</span><span class="strut">&nbsp;</span></p>
             </td>
         </tr>
     </table>
@@ -92,7 +86,7 @@
     <div class="content">
         <p>
             <a class="nav" href="index.html">&#xab; index</a> &nbsp; &nbsp; <a class="nav" href="https://coverage.readthedocs.io/en/coverage-5.0a2">coverage.py v5.0a2</a>,
-            created at 2018-06-29 15:44
+            created at 2018-08-22 20:00
         </p>
     </div>
 </div>
diff --git a/tests/farm/html/gold_bom/index.html b/tests/farm/html/gold_bom/index.html
index 0341c0d0..13c55bf6 100644
--- a/tests/farm/html/gold_bom/index.html
+++ b/tests/farm/html/gold_bom/index.html
@@ -76,7 +76,7 @@
     <div class="content">
         <p>
             <a class="nav" href="https://coverage.readthedocs.io/en/coverage-5.0a2">coverage.py v5.0a2</a>,
-            created at 2018-06-29 15:44
+            created at 2018-08-22 20:00
         </p>
     </div>
 </div>
diff --git a/tests/farm/html/gold_isolatin1/index.html b/tests/farm/html/gold_isolatin1/index.html
index ec125364..160efcb6 100644
--- a/tests/farm/html/gold_isolatin1/index.html
+++ b/tests/farm/html/gold_isolatin1/index.html
@@ -76,7 +76,7 @@
     <div class="content">
         <p>
             <a class="nav" href="https://coverage.readthedocs.io/en/coverage-5.0a2">coverage.py v5.0a2</a>,
-            created at 2018-06-29 15:40
+            created at 2018-08-22 19:42
         </p>
     </div>
 </div>
diff --git a/tests/farm/html/gold_isolatin1/isolatin1_py.html b/tests/farm/html/gold_isolatin1/isolatin1_py.html
index 45d13f42..02e0ac0a 100644
--- a/tests/farm/html/gold_isolatin1/isolatin1_py.html
+++ b/tests/farm/html/gold_isolatin1/isolatin1_py.html
@@ -57,21 +57,15 @@
 <p id="n1" class="pln"><a href="#n1">1</a></p>
 <p id="n2" class="pln"><a href="#n2">2</a></p>
 <p id="n3" class="pln"><a href="#n3">3</a></p>
-<p id="n4" class="pln"><a href="#n4">4</a></p>
-<p id="n5" class="pln"><a href="#n5">5</a></p>
-<p id="n6" class="pln"><a href="#n6">6</a></p>
-<p id="n7" class="stm run hide_run"><a href="#n7">7</a></p>
-<p id="n8" class="stm run hide_run"><a href="#n8">8</a></p>
+<p id="n4" class="stm run hide_run"><a href="#n4">4</a></p>
+<p id="n5" class="stm run hide_run"><a href="#n5">5</a></p>
             </td>
             <td class="text">
 <p id="t1" class="pln"><span class="com"># -*- coding: iso8859-1 -*-</span><span class="strut">&nbsp;</span></p>
-<p id="t2" class="pln"><span class="com"># Licensed under the Apache License: http://www.apache.org/licenses/LICENSE-2.0</span><span class="strut">&nbsp;</span></p>
-<p id="t3" class="pln"><span class="com"># For details: https://github.com/nedbat/coveragepy/blob/master/NOTICE.txt</span><span class="strut">&nbsp;</span></p>
-<p id="t4" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t5" class="pln"><span class="com"># A Python source file in another encoding.</span><span class="strut">&nbsp;</span></p>
-<p id="t6" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t7" class="stm run hide_run"><span class="nam">math</span> <span class="op">=</span> <span class="str">"3&#215;4 = 12, &#247;2 = 6&#177;0"</span><span class="strut">&nbsp;</span></p>
-<p id="t8" class="stm run hide_run"><span class="key">assert</span> <span class="nam">len</span><span class="op">(</span><span class="nam">math</span><span class="op">)</span> <span class="op">==</span> <span class="num">18</span><span class="strut">&nbsp;</span></p>
+<p id="t2" class="pln"><span class="com"># A Python source file in another encoding.</span><span class="strut">&nbsp;</span></p>
+<p id="t3" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t4" class="stm run hide_run"><span class="nam">math</span> <span class="op">=</span> <span class="str">"3&#215;4 = 12, &#247;2 = 6&#177;0"</span><span class="strut">&nbsp;</span></p>
+<p id="t5" class="stm run hide_run"><span class="key">assert</span> <span class="nam">len</span><span class="op">(</span><span class="nam">math</span><span class="op">)</span> <span class="op">==</span> <span class="num">18</span><span class="strut">&nbsp;</span></p>
             </td>
         </tr>
     </table>
@@ -80,7 +74,7 @@
     <div class="content">
         <p>
             <a class="nav" href="index.html">&#xab; index</a> &nbsp; &nbsp; <a class="nav" href="https://coverage.readthedocs.io/en/coverage-5.0a2">coverage.py v5.0a2</a>,
-            created at 2018-06-29 15:40
+            created at 2018-08-22 19:42
         </p>
     </div>
 </div>
diff --git a/tests/farm/html/gold_omit_1/index.html b/tests/farm/html/gold_omit_1/index.html
index 9ea591a4..95356e06 100644
--- a/tests/farm/html/gold_omit_1/index.html
+++ b/tests/farm/html/gold_omit_1/index.html
@@ -97,7 +97,7 @@
     <div class="content">
         <p>
             <a class="nav" href="https://coverage.readthedocs.io/en/coverage-5.0a2">coverage.py v5.0a2</a>,
-            created at 2018-06-29 15:43
+            created at 2018-08-22 19:42
         </p>
     </div>
 </div>
diff --git a/tests/farm/html/gold_omit_1/m1_py.html b/tests/farm/html/gold_omit_1/m1_py.html
index 1557156c..9ea4648e 100644
--- a/tests/farm/html/gold_omit_1/m1_py.html
+++ b/tests/farm/html/gold_omit_1/m1_py.html
@@ -54,18 +54,12 @@
     <table>
         <tr>
             <td class="linenos">
-<p id="n1" class="pln"><a href="#n1">1</a></p>
-<p id="n2" class="pln"><a href="#n2">2</a></p>
-<p id="n3" class="pln"><a href="#n3">3</a></p>
-<p id="n4" class="stm run hide_run"><a href="#n4">4</a></p>
-<p id="n5" class="stm run hide_run"><a href="#n5">5</a></p>
+<p id="n1" class="stm run hide_run"><a href="#n1">1</a></p>
+<p id="n2" class="stm run hide_run"><a href="#n2">2</a></p>
             </td>
             <td class="text">
-<p id="t1" class="pln"><span class="com"># Licensed under the Apache License: http://www.apache.org/licenses/LICENSE-2.0</span><span class="strut">&nbsp;</span></p>
-<p id="t2" class="pln"><span class="com"># For details: https://github.com/nedbat/coveragepy/blob/master/NOTICE.txt</span><span class="strut">&nbsp;</span></p>
-<p id="t3" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t4" class="stm run hide_run"><span class="nam">m1a</span> <span class="op">=</span> <span class="num">1</span><span class="strut">&nbsp;</span></p>
-<p id="t5" class="stm run hide_run"><span class="nam">m1b</span> <span class="op">=</span> <span class="num">2</span><span class="strut">&nbsp;</span></p>
+<p id="t1" class="stm run hide_run"><span class="nam">m1a</span> <span class="op">=</span> <span class="num">1</span><span class="strut">&nbsp;</span></p>
+<p id="t2" class="stm run hide_run"><span class="nam">m1b</span> <span class="op">=</span> <span class="num">2</span><span class="strut">&nbsp;</span></p>
             </td>
         </tr>
     </table>
@@ -74,7 +68,7 @@
     <div class="content">
         <p>
             <a class="nav" href="index.html">&#xab; index</a> &nbsp; &nbsp; <a class="nav" href="https://coverage.readthedocs.io/en/coverage-5.0a2">coverage.py v5.0a2</a>,
-            created at 2018-06-29 15:43
+            created at 2018-08-22 19:42
         </p>
     </div>
 </div>
diff --git a/tests/farm/html/gold_omit_1/m2_py.html b/tests/farm/html/gold_omit_1/m2_py.html
index 8f3102d1..d6647ac0 100644
--- a/tests/farm/html/gold_omit_1/m2_py.html
+++ b/tests/farm/html/gold_omit_1/m2_py.html
@@ -54,18 +54,12 @@
     <table>
         <tr>
             <td class="linenos">
-<p id="n1" class="pln"><a href="#n1">1</a></p>
-<p id="n2" class="pln"><a href="#n2">2</a></p>
-<p id="n3" class="pln"><a href="#n3">3</a></p>
-<p id="n4" class="stm run hide_run"><a href="#n4">4</a></p>
-<p id="n5" class="stm run hide_run"><a href="#n5">5</a></p>
+<p id="n1" class="stm run hide_run"><a href="#n1">1</a></p>
+<p id="n2" class="stm run hide_run"><a href="#n2">2</a></p>
             </td>
             <td class="text">
-<p id="t1" class="pln"><span class="com"># Licensed under the Apache License: http://www.apache.org/licenses/LICENSE-2.0</span><span class="strut">&nbsp;</span></p>
-<p id="t2" class="pln"><span class="com"># For details: https://github.com/nedbat/coveragepy/blob/master/NOTICE.txt</span><span class="strut">&nbsp;</span></p>
-<p id="t3" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t4" class="stm run hide_run"><span class="nam">m2a</span> <span class="op">=</span> <span class="num">1</span><span class="strut">&nbsp;</span></p>
-<p id="t5" class="stm run hide_run"><span class="nam">m2b</span> <span class="op">=</span> <span class="num">2</span><span class="strut">&nbsp;</span></p>
+<p id="t1" class="stm run hide_run"><span class="nam">m2a</span> <span class="op">=</span> <span class="num">1</span><span class="strut">&nbsp;</span></p>
+<p id="t2" class="stm run hide_run"><span class="nam">m2b</span> <span class="op">=</span> <span class="num">2</span><span class="strut">&nbsp;</span></p>
             </td>
         </tr>
     </table>
@@ -74,7 +68,7 @@
     <div class="content">
         <p>
             <a class="nav" href="index.html">&#xab; index</a> &nbsp; &nbsp; <a class="nav" href="https://coverage.readthedocs.io/en/coverage-5.0a2">coverage.py v5.0a2</a>,
-            created at 2018-06-29 15:43
+            created at 2018-08-22 19:42
         </p>
     </div>
 </div>
diff --git a/tests/farm/html/gold_omit_1/m3_py.html b/tests/farm/html/gold_omit_1/m3_py.html
index 2d1e1d4c..e5a9ebf7 100644
--- a/tests/farm/html/gold_omit_1/m3_py.html
+++ b/tests/farm/html/gold_omit_1/m3_py.html
@@ -54,18 +54,12 @@
     <table>
         <tr>
             <td class="linenos">
-<p id="n1" class="pln"><a href="#n1">1</a></p>
-<p id="n2" class="pln"><a href="#n2">2</a></p>
-<p id="n3" class="pln"><a href="#n3">3</a></p>
-<p id="n4" class="stm run hide_run"><a href="#n4">4</a></p>
-<p id="n5" class="stm run hide_run"><a href="#n5">5</a></p>
+<p id="n1" class="stm run hide_run"><a href="#n1">1</a></p>
+<p id="n2" class="stm run hide_run"><a href="#n2">2</a></p>
             </td>
             <td class="text">
-<p id="t1" class="pln"><span class="com"># Licensed under the Apache License: http://www.apache.org/licenses/LICENSE-2.0</span><span class="strut">&nbsp;</span></p>
-<p id="t2" class="pln"><span class="com"># For details: https://github.com/nedbat/coveragepy/blob/master/NOTICE.txt</span><span class="strut">&nbsp;</span></p>
-<p id="t3" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t4" class="stm run hide_run"><span class="nam">m3a</span> <span class="op">=</span> <span class="num">1</span><span class="strut">&nbsp;</span></p>
-<p id="t5" class="stm run hide_run"><span class="nam">m3b</span> <span class="op">=</span> <span class="num">2</span><span class="strut">&nbsp;</span></p>
+<p id="t1" class="stm run hide_run"><span class="nam">m3a</span> <span class="op">=</span> <span class="num">1</span><span class="strut">&nbsp;</span></p>
+<p id="t2" class="stm run hide_run"><span class="nam">m3b</span> <span class="op">=</span> <span class="num">2</span><span class="strut">&nbsp;</span></p>
             </td>
         </tr>
     </table>
@@ -74,7 +68,7 @@
     <div class="content">
         <p>
             <a class="nav" href="index.html">&#xab; index</a> &nbsp; &nbsp; <a class="nav" href="https://coverage.readthedocs.io/en/coverage-5.0a2">coverage.py v5.0a2</a>,
-            created at 2018-06-29 15:43
+            created at 2018-08-22 19:42
         </p>
     </div>
 </div>
diff --git a/tests/farm/html/gold_omit_1/main_py.html b/tests/farm/html/gold_omit_1/main_py.html
index bc93b1a0..cc763094 100644
--- a/tests/farm/html/gold_omit_1/main_py.html
+++ b/tests/farm/html/gold_omit_1/main_py.html
@@ -54,34 +54,28 @@
     <table>
         <tr>
             <td class="linenos">
-<p id="n1" class="pln"><a href="#n1">1</a></p>
-<p id="n2" class="pln"><a href="#n2">2</a></p>
-<p id="n3" class="pln"><a href="#n3">3</a></p>
-<p id="n4" class="stm run hide_run"><a href="#n4">4</a></p>
+<p id="n1" class="stm run hide_run"><a href="#n1">1</a></p>
+<p id="n2" class="stm run hide_run"><a href="#n2">2</a></p>
+<p id="n3" class="stm run hide_run"><a href="#n3">3</a></p>
+<p id="n4" class="pln"><a href="#n4">4</a></p>
 <p id="n5" class="stm run hide_run"><a href="#n5">5</a></p>
 <p id="n6" class="stm run hide_run"><a href="#n6">6</a></p>
 <p id="n7" class="pln"><a href="#n7">7</a></p>
 <p id="n8" class="stm run hide_run"><a href="#n8">8</a></p>
 <p id="n9" class="stm run hide_run"><a href="#n9">9</a></p>
-<p id="n10" class="pln"><a href="#n10">10</a></p>
-<p id="n11" class="stm run hide_run"><a href="#n11">11</a></p>
-<p id="n12" class="stm run hide_run"><a href="#n12">12</a></p>
-<p id="n13" class="stm run hide_run"><a href="#n13">13</a></p>
+<p id="n10" class="stm run hide_run"><a href="#n10">10</a></p>
             </td>
             <td class="text">
-<p id="t1" class="pln"><span class="com"># Licensed under the Apache License: http://www.apache.org/licenses/LICENSE-2.0</span><span class="strut">&nbsp;</span></p>
-<p id="t2" class="pln"><span class="com"># For details: https://github.com/nedbat/coveragepy/blob/master/NOTICE.txt</span><span class="strut">&nbsp;</span></p>
-<p id="t3" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t4" class="stm run hide_run"><span class="key">import</span> <span class="nam">m1</span><span class="strut">&nbsp;</span></p>
-<p id="t5" class="stm run hide_run"><span class="key">import</span> <span class="nam">m2</span><span class="strut">&nbsp;</span></p>
-<p id="t6" class="stm run hide_run"><span class="key">import</span> <span class="nam">m3</span><span class="strut">&nbsp;</span></p>
+<p id="t1" class="stm run hide_run"><span class="key">import</span> <span class="nam">m1</span><span class="strut">&nbsp;</span></p>
+<p id="t2" class="stm run hide_run"><span class="key">import</span> <span class="nam">m2</span><span class="strut">&nbsp;</span></p>
+<p id="t3" class="stm run hide_run"><span class="key">import</span> <span class="nam">m3</span><span class="strut">&nbsp;</span></p>
+<p id="t4" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t5" class="stm run hide_run"><span class="nam">a</span> <span class="op">=</span> <span class="num">5</span><span class="strut">&nbsp;</span></p>
+<p id="t6" class="stm run hide_run"><span class="nam">b</span> <span class="op">=</span> <span class="num">6</span><span class="strut">&nbsp;</span></p>
 <p id="t7" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t8" class="stm run hide_run"><span class="nam">a</span> <span class="op">=</span> <span class="num">5</span><span class="strut">&nbsp;</span></p>
-<p id="t9" class="stm run hide_run"><span class="nam">b</span> <span class="op">=</span> <span class="num">6</span><span class="strut">&nbsp;</span></p>
-<p id="t10" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t11" class="stm run hide_run"><span class="key">assert</span> <span class="nam">m1</span><span class="op">.</span><span class="nam">m1a</span> <span class="op">==</span> <span class="num">1</span><span class="strut">&nbsp;</span></p>
-<p id="t12" class="stm run hide_run"><span class="key">assert</span> <span class="nam">m2</span><span class="op">.</span><span class="nam">m2a</span> <span class="op">==</span> <span class="num">1</span><span class="strut">&nbsp;</span></p>
-<p id="t13" class="stm run hide_run"><span class="key">assert</span> <span class="nam">m3</span><span class="op">.</span><span class="nam">m3a</span> <span class="op">==</span> <span class="num">1</span><span class="strut">&nbsp;</span></p>
+<p id="t8" class="stm run hide_run"><span class="key">assert</span> <span class="nam">m1</span><span class="op">.</span><span class="nam">m1a</span> <span class="op">==</span> <span class="num">1</span><span class="strut">&nbsp;</span></p>
+<p id="t9" class="stm run hide_run"><span class="key">assert</span> <span class="nam">m2</span><span class="op">.</span><span class="nam">m2a</span> <span class="op">==</span> <span class="num">1</span><span class="strut">&nbsp;</span></p>
+<p id="t10" class="stm run hide_run"><span class="key">assert</span> <span class="nam">m3</span><span class="op">.</span><span class="nam">m3a</span> <span class="op">==</span> <span class="num">1</span><span class="strut">&nbsp;</span></p>
             </td>
         </tr>
     </table>
@@ -90,7 +84,7 @@
     <div class="content">
         <p>
             <a class="nav" href="index.html">&#xab; index</a> &nbsp; &nbsp; <a class="nav" href="https://coverage.readthedocs.io/en/coverage-5.0a2">coverage.py v5.0a2</a>,
-            created at 2018-06-29 15:43
+            created at 2018-08-22 19:42
         </p>
     </div>
 </div>
diff --git a/tests/farm/html/gold_omit_2/index.html b/tests/farm/html/gold_omit_2/index.html
index 8c2576f2..5e78cd3a 100644
--- a/tests/farm/html/gold_omit_2/index.html
+++ b/tests/farm/html/gold_omit_2/index.html
@@ -90,7 +90,7 @@
     <div class="content">
         <p>
             <a class="nav" href="https://coverage.readthedocs.io/en/coverage-5.0a2">coverage.py v5.0a2</a>,
-            created at 2018-06-29 15:43
+            created at 2018-08-22 19:42
         </p>
     </div>
 </div>
diff --git a/tests/farm/html/gold_omit_2/m2_py.html b/tests/farm/html/gold_omit_2/m2_py.html
index 8f3102d1..d6647ac0 100644
--- a/tests/farm/html/gold_omit_2/m2_py.html
+++ b/tests/farm/html/gold_omit_2/m2_py.html
@@ -54,18 +54,12 @@
     <table>
         <tr>
             <td class="linenos">
-<p id="n1" class="pln"><a href="#n1">1</a></p>
-<p id="n2" class="pln"><a href="#n2">2</a></p>
-<p id="n3" class="pln"><a href="#n3">3</a></p>
-<p id="n4" class="stm run hide_run"><a href="#n4">4</a></p>
-<p id="n5" class="stm run hide_run"><a href="#n5">5</a></p>
+<p id="n1" class="stm run hide_run"><a href="#n1">1</a></p>
+<p id="n2" class="stm run hide_run"><a href="#n2">2</a></p>
             </td>
             <td class="text">
-<p id="t1" class="pln"><span class="com"># Licensed under the Apache License: http://www.apache.org/licenses/LICENSE-2.0</span><span class="strut">&nbsp;</span></p>
-<p id="t2" class="pln"><span class="com"># For details: https://github.com/nedbat/coveragepy/blob/master/NOTICE.txt</span><span class="strut">&nbsp;</span></p>
-<p id="t3" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t4" class="stm run hide_run"><span class="nam">m2a</span> <span class="op">=</span> <span class="num">1</span><span class="strut">&nbsp;</span></p>
-<p id="t5" class="stm run hide_run"><span class="nam">m2b</span> <span class="op">=</span> <span class="num">2</span><span class="strut">&nbsp;</span></p>
+<p id="t1" class="stm run hide_run"><span class="nam">m2a</span> <span class="op">=</span> <span class="num">1</span><span class="strut">&nbsp;</span></p>
+<p id="t2" class="stm run hide_run"><span class="nam">m2b</span> <span class="op">=</span> <span class="num">2</span><span class="strut">&nbsp;</span></p>
             </td>
         </tr>
     </table>
@@ -74,7 +68,7 @@
     <div class="content">
         <p>
             <a class="nav" href="index.html">&#xab; index</a> &nbsp; &nbsp; <a class="nav" href="https://coverage.readthedocs.io/en/coverage-5.0a2">coverage.py v5.0a2</a>,
-            created at 2018-06-29 15:43
+            created at 2018-08-22 19:42
         </p>
     </div>
 </div>
diff --git a/tests/farm/html/gold_omit_2/m3_py.html b/tests/farm/html/gold_omit_2/m3_py.html
index 2d1e1d4c..e5a9ebf7 100644
--- a/tests/farm/html/gold_omit_2/m3_py.html
+++ b/tests/farm/html/gold_omit_2/m3_py.html
@@ -54,18 +54,12 @@
     <table>
         <tr>
             <td class="linenos">
-<p id="n1" class="pln"><a href="#n1">1</a></p>
-<p id="n2" class="pln"><a href="#n2">2</a></p>
-<p id="n3" class="pln"><a href="#n3">3</a></p>
-<p id="n4" class="stm run hide_run"><a href="#n4">4</a></p>
-<p id="n5" class="stm run hide_run"><a href="#n5">5</a></p>
+<p id="n1" class="stm run hide_run"><a href="#n1">1</a></p>
+<p id="n2" class="stm run hide_run"><a href="#n2">2</a></p>
             </td>
             <td class="text">
-<p id="t1" class="pln"><span class="com"># Licensed under the Apache License: http://www.apache.org/licenses/LICENSE-2.0</span><span class="strut">&nbsp;</span></p>
-<p id="t2" class="pln"><span class="com"># For details: https://github.com/nedbat/coveragepy/blob/master/NOTICE.txt</span><span class="strut">&nbsp;</span></p>
-<p id="t3" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t4" class="stm run hide_run"><span class="nam">m3a</span> <span class="op">=</span> <span class="num">1</span><span class="strut">&nbsp;</span></p>
-<p id="t5" class="stm run hide_run"><span class="nam">m3b</span> <span class="op">=</span> <span class="num">2</span><span class="strut">&nbsp;</span></p>
+<p id="t1" class="stm run hide_run"><span class="nam">m3a</span> <span class="op">=</span> <span class="num">1</span><span class="strut">&nbsp;</span></p>
+<p id="t2" class="stm run hide_run"><span class="nam">m3b</span> <span class="op">=</span> <span class="num">2</span><span class="strut">&nbsp;</span></p>
             </td>
         </tr>
     </table>
@@ -74,7 +68,7 @@
     <div class="content">
         <p>
             <a class="nav" href="index.html">&#xab; index</a> &nbsp; &nbsp; <a class="nav" href="https://coverage.readthedocs.io/en/coverage-5.0a2">coverage.py v5.0a2</a>,
-            created at 2018-06-29 15:43
+            created at 2018-08-22 19:42
         </p>
     </div>
 </div>
diff --git a/tests/farm/html/gold_omit_2/main_py.html b/tests/farm/html/gold_omit_2/main_py.html
index bc93b1a0..cc763094 100644
--- a/tests/farm/html/gold_omit_2/main_py.html
+++ b/tests/farm/html/gold_omit_2/main_py.html
@@ -54,34 +54,28 @@
     <table>
         <tr>
             <td class="linenos">
-<p id="n1" class="pln"><a href="#n1">1</a></p>
-<p id="n2" class="pln"><a href="#n2">2</a></p>
-<p id="n3" class="pln"><a href="#n3">3</a></p>
-<p id="n4" class="stm run hide_run"><a href="#n4">4</a></p>
+<p id="n1" class="stm run hide_run"><a href="#n1">1</a></p>
+<p id="n2" class="stm run hide_run"><a href="#n2">2</a></p>
+<p id="n3" class="stm run hide_run"><a href="#n3">3</a></p>
+<p id="n4" class="pln"><a href="#n4">4</a></p>
 <p id="n5" class="stm run hide_run"><a href="#n5">5</a></p>
 <p id="n6" class="stm run hide_run"><a href="#n6">6</a></p>
 <p id="n7" class="pln"><a href="#n7">7</a></p>
 <p id="n8" class="stm run hide_run"><a href="#n8">8</a></p>
 <p id="n9" class="stm run hide_run"><a href="#n9">9</a></p>
-<p id="n10" class="pln"><a href="#n10">10</a></p>
-<p id="n11" class="stm run hide_run"><a href="#n11">11</a></p>
-<p id="n12" class="stm run hide_run"><a href="#n12">12</a></p>
-<p id="n13" class="stm run hide_run"><a href="#n13">13</a></p>
+<p id="n10" class="stm run hide_run"><a href="#n10">10</a></p>
             </td>
             <td class="text">
-<p id="t1" class="pln"><span class="com"># Licensed under the Apache License: http://www.apache.org/licenses/LICENSE-2.0</span><span class="strut">&nbsp;</span></p>
-<p id="t2" class="pln"><span class="com"># For details: https://github.com/nedbat/coveragepy/blob/master/NOTICE.txt</span><span class="strut">&nbsp;</span></p>
-<p id="t3" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t4" class="stm run hide_run"><span class="key">import</span> <span class="nam">m1</span><span class="strut">&nbsp;</span></p>
-<p id="t5" class="stm run hide_run"><span class="key">import</span> <span class="nam">m2</span><span class="strut">&nbsp;</span></p>
-<p id="t6" class="stm run hide_run"><span class="key">import</span> <span class="nam">m3</span><span class="strut">&nbsp;</span></p>
+<p id="t1" class="stm run hide_run"><span class="key">import</span> <span class="nam">m1</span><span class="strut">&nbsp;</span></p>
+<p id="t2" class="stm run hide_run"><span class="key">import</span> <span class="nam">m2</span><span class="strut">&nbsp;</span></p>
+<p id="t3" class="stm run hide_run"><span class="key">import</span> <span class="nam">m3</span><span class="strut">&nbsp;</span></p>
+<p id="t4" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t5" class="stm run hide_run"><span class="nam">a</span> <span class="op">=</span> <span class="num">5</span><span class="strut">&nbsp;</span></p>
+<p id="t6" class="stm run hide_run"><span class="nam">b</span> <span class="op">=</span> <span class="num">6</span><span class="strut">&nbsp;</span></p>
 <p id="t7" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t8" class="stm run hide_run"><span class="nam">a</span> <span class="op">=</span> <span class="num">5</span><span class="strut">&nbsp;</span></p>
-<p id="t9" class="stm run hide_run"><span class="nam">b</span> <span class="op">=</span> <span class="num">6</span><span class="strut">&nbsp;</span></p>
-<p id="t10" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t11" class="stm run hide_run"><span class="key">assert</span> <span class="nam">m1</span><span class="op">.</span><span class="nam">m1a</span> <span class="op">==</span> <span class="num">1</span><span class="strut">&nbsp;</span></p>
-<p id="t12" class="stm run hide_run"><span class="key">assert</span> <span class="nam">m2</span><span class="op">.</span><span class="nam">m2a</span> <span class="op">==</span> <span class="num">1</span><span class="strut">&nbsp;</span></p>
-<p id="t13" class="stm run hide_run"><span class="key">assert</span> <span class="nam">m3</span><span class="op">.</span><span class="nam">m3a</span> <span class="op">==</span> <span class="num">1</span><span class="strut">&nbsp;</span></p>
+<p id="t8" class="stm run hide_run"><span class="key">assert</span> <span class="nam">m1</span><span class="op">.</span><span class="nam">m1a</span> <span class="op">==</span> <span class="num">1</span><span class="strut">&nbsp;</span></p>
+<p id="t9" class="stm run hide_run"><span class="key">assert</span> <span class="nam">m2</span><span class="op">.</span><span class="nam">m2a</span> <span class="op">==</span> <span class="num">1</span><span class="strut">&nbsp;</span></p>
+<p id="t10" class="stm run hide_run"><span class="key">assert</span> <span class="nam">m3</span><span class="op">.</span><span class="nam">m3a</span> <span class="op">==</span> <span class="num">1</span><span class="strut">&nbsp;</span></p>
             </td>
         </tr>
     </table>
@@ -90,7 +84,7 @@
     <div class="content">
         <p>
             <a class="nav" href="index.html">&#xab; index</a> &nbsp; &nbsp; <a class="nav" href="https://coverage.readthedocs.io/en/coverage-5.0a2">coverage.py v5.0a2</a>,
-            created at 2018-06-29 15:43
+            created at 2018-08-22 19:42
         </p>
     </div>
 </div>
diff --git a/tests/farm/html/gold_omit_3/index.html b/tests/farm/html/gold_omit_3/index.html
index f0b32cc4..5c03fb8f 100644
--- a/tests/farm/html/gold_omit_3/index.html
+++ b/tests/farm/html/gold_omit_3/index.html
@@ -83,7 +83,7 @@
     <div class="content">
         <p>
             <a class="nav" href="https://coverage.readthedocs.io/en/coverage-5.0a2">coverage.py v5.0a2</a>,
-            created at 2018-06-29 15:43
+            created at 2018-08-22 19:42
         </p>
     </div>
 </div>
diff --git a/tests/farm/html/gold_omit_3/m3_py.html b/tests/farm/html/gold_omit_3/m3_py.html
index 2d1e1d4c..e5a9ebf7 100644
--- a/tests/farm/html/gold_omit_3/m3_py.html
+++ b/tests/farm/html/gold_omit_3/m3_py.html
@@ -54,18 +54,12 @@
     <table>
         <tr>
             <td class="linenos">
-<p id="n1" class="pln"><a href="#n1">1</a></p>
-<p id="n2" class="pln"><a href="#n2">2</a></p>
-<p id="n3" class="pln"><a href="#n3">3</a></p>
-<p id="n4" class="stm run hide_run"><a href="#n4">4</a></p>
-<p id="n5" class="stm run hide_run"><a href="#n5">5</a></p>
+<p id="n1" class="stm run hide_run"><a href="#n1">1</a></p>
+<p id="n2" class="stm run hide_run"><a href="#n2">2</a></p>
             </td>
             <td class="text">
-<p id="t1" class="pln"><span class="com"># Licensed under the Apache License: http://www.apache.org/licenses/LICENSE-2.0</span><span class="strut">&nbsp;</span></p>
-<p id="t2" class="pln"><span class="com"># For details: https://github.com/nedbat/coveragepy/blob/master/NOTICE.txt</span><span class="strut">&nbsp;</span></p>
-<p id="t3" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t4" class="stm run hide_run"><span class="nam">m3a</span> <span class="op">=</span> <span class="num">1</span><span class="strut">&nbsp;</span></p>
-<p id="t5" class="stm run hide_run"><span class="nam">m3b</span> <span class="op">=</span> <span class="num">2</span><span class="strut">&nbsp;</span></p>
+<p id="t1" class="stm run hide_run"><span class="nam">m3a</span> <span class="op">=</span> <span class="num">1</span><span class="strut">&nbsp;</span></p>
+<p id="t2" class="stm run hide_run"><span class="nam">m3b</span> <span class="op">=</span> <span class="num">2</span><span class="strut">&nbsp;</span></p>
             </td>
         </tr>
     </table>
@@ -74,7 +68,7 @@
     <div class="content">
         <p>
             <a class="nav" href="index.html">&#xab; index</a> &nbsp; &nbsp; <a class="nav" href="https://coverage.readthedocs.io/en/coverage-5.0a2">coverage.py v5.0a2</a>,
-            created at 2018-06-29 15:43
+            created at 2018-08-22 19:42
         </p>
     </div>
 </div>
diff --git a/tests/farm/html/gold_omit_3/main_py.html b/tests/farm/html/gold_omit_3/main_py.html
index bc93b1a0..cc763094 100644
--- a/tests/farm/html/gold_omit_3/main_py.html
+++ b/tests/farm/html/gold_omit_3/main_py.html
@@ -54,34 +54,28 @@
     <table>
         <tr>
             <td class="linenos">
-<p id="n1" class="pln"><a href="#n1">1</a></p>
-<p id="n2" class="pln"><a href="#n2">2</a></p>
-<p id="n3" class="pln"><a href="#n3">3</a></p>
-<p id="n4" class="stm run hide_run"><a href="#n4">4</a></p>
+<p id="n1" class="stm run hide_run"><a href="#n1">1</a></p>
+<p id="n2" class="stm run hide_run"><a href="#n2">2</a></p>
+<p id="n3" class="stm run hide_run"><a href="#n3">3</a></p>
+<p id="n4" class="pln"><a href="#n4">4</a></p>
 <p id="n5" class="stm run hide_run"><a href="#n5">5</a></p>
 <p id="n6" class="stm run hide_run"><a href="#n6">6</a></p>
 <p id="n7" class="pln"><a href="#n7">7</a></p>
 <p id="n8" class="stm run hide_run"><a href="#n8">8</a></p>
 <p id="n9" class="stm run hide_run"><a href="#n9">9</a></p>
-<p id="n10" class="pln"><a href="#n10">10</a></p>
-<p id="n11" class="stm run hide_run"><a href="#n11">11</a></p>
-<p id="n12" class="stm run hide_run"><a href="#n12">12</a></p>
-<p id="n13" class="stm run hide_run"><a href="#n13">13</a></p>
+<p id="n10" class="stm run hide_run"><a href="#n10">10</a></p>
             </td>
             <td class="text">
-<p id="t1" class="pln"><span class="com"># Licensed under the Apache License: http://www.apache.org/licenses/LICENSE-2.0</span><span class="strut">&nbsp;</span></p>
-<p id="t2" class="pln"><span class="com"># For details: https://github.com/nedbat/coveragepy/blob/master/NOTICE.txt</span><span class="strut">&nbsp;</span></p>
-<p id="t3" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t4" class="stm run hide_run"><span class="key">import</span> <span class="nam">m1</span><span class="strut">&nbsp;</span></p>
-<p id="t5" class="stm run hide_run"><span class="key">import</span> <span class="nam">m2</span><span class="strut">&nbsp;</span></p>
-<p id="t6" class="stm run hide_run"><span class="key">import</span> <span class="nam">m3</span><span class="strut">&nbsp;</span></p>
+<p id="t1" class="stm run hide_run"><span class="key">import</span> <span class="nam">m1</span><span class="strut">&nbsp;</span></p>
+<p id="t2" class="stm run hide_run"><span class="key">import</span> <span class="nam">m2</span><span class="strut">&nbsp;</span></p>
+<p id="t3" class="stm run hide_run"><span class="key">import</span> <span class="nam">m3</span><span class="strut">&nbsp;</span></p>
+<p id="t4" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t5" class="stm run hide_run"><span class="nam">a</span> <span class="op">=</span> <span class="num">5</span><span class="strut">&nbsp;</span></p>
+<p id="t6" class="stm run hide_run"><span class="nam">b</span> <span class="op">=</span> <span class="num">6</span><span class="strut">&nbsp;</span></p>
 <p id="t7" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t8" class="stm run hide_run"><span class="nam">a</span> <span class="op">=</span> <span class="num">5</span><span class="strut">&nbsp;</span></p>
-<p id="t9" class="stm run hide_run"><span class="nam">b</span> <span class="op">=</span> <span class="num">6</span><span class="strut">&nbsp;</span></p>
-<p id="t10" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t11" class="stm run hide_run"><span class="key">assert</span> <span class="nam">m1</span><span class="op">.</span><span class="nam">m1a</span> <span class="op">==</span> <span class="num">1</span><span class="strut">&nbsp;</span></p>
-<p id="t12" class="stm run hide_run"><span class="key">assert</span> <span class="nam">m2</span><span class="op">.</span><span class="nam">m2a</span> <span class="op">==</span> <span class="num">1</span><span class="strut">&nbsp;</span></p>
-<p id="t13" class="stm run hide_run"><span class="key">assert</span> <span class="nam">m3</span><span class="op">.</span><span class="nam">m3a</span> <span class="op">==</span> <span class="num">1</span><span class="strut">&nbsp;</span></p>
+<p id="t8" class="stm run hide_run"><span class="key">assert</span> <span class="nam">m1</span><span class="op">.</span><span class="nam">m1a</span> <span class="op">==</span> <span class="num">1</span><span class="strut">&nbsp;</span></p>
+<p id="t9" class="stm run hide_run"><span class="key">assert</span> <span class="nam">m2</span><span class="op">.</span><span class="nam">m2a</span> <span class="op">==</span> <span class="num">1</span><span class="strut">&nbsp;</span></p>
+<p id="t10" class="stm run hide_run"><span class="key">assert</span> <span class="nam">m3</span><span class="op">.</span><span class="nam">m3a</span> <span class="op">==</span> <span class="num">1</span><span class="strut">&nbsp;</span></p>
             </td>
         </tr>
     </table>
@@ -90,7 +84,7 @@
     <div class="content">
         <p>
             <a class="nav" href="index.html">&#xab; index</a> &nbsp; &nbsp; <a class="nav" href="https://coverage.readthedocs.io/en/coverage-5.0a2">coverage.py v5.0a2</a>,
-            created at 2018-06-29 15:43
+            created at 2018-08-22 19:42
         </p>
     </div>
 </div>
diff --git a/tests/farm/html/gold_omit_4/index.html b/tests/farm/html/gold_omit_4/index.html
index 7dadd229..13c4ab69 100644
--- a/tests/farm/html/gold_omit_4/index.html
+++ b/tests/farm/html/gold_omit_4/index.html
@@ -90,7 +90,7 @@
     <div class="content">
         <p>
             <a class="nav" href="https://coverage.readthedocs.io/en/coverage-5.0a2">coverage.py v5.0a2</a>,
-            created at 2018-06-29 15:43
+            created at 2018-08-22 19:42
         </p>
     </div>
 </div>
diff --git a/tests/farm/html/gold_omit_4/m1_py.html b/tests/farm/html/gold_omit_4/m1_py.html
index 1557156c..9ea4648e 100644
--- a/tests/farm/html/gold_omit_4/m1_py.html
+++ b/tests/farm/html/gold_omit_4/m1_py.html
@@ -54,18 +54,12 @@
     <table>
         <tr>
             <td class="linenos">
-<p id="n1" class="pln"><a href="#n1">1</a></p>
-<p id="n2" class="pln"><a href="#n2">2</a></p>
-<p id="n3" class="pln"><a href="#n3">3</a></p>
-<p id="n4" class="stm run hide_run"><a href="#n4">4</a></p>
-<p id="n5" class="stm run hide_run"><a href="#n5">5</a></p>
+<p id="n1" class="stm run hide_run"><a href="#n1">1</a></p>
+<p id="n2" class="stm run hide_run"><a href="#n2">2</a></p>
             </td>
             <td class="text">
-<p id="t1" class="pln"><span class="com"># Licensed under the Apache License: http://www.apache.org/licenses/LICENSE-2.0</span><span class="strut">&nbsp;</span></p>
-<p id="t2" class="pln"><span class="com"># For details: https://github.com/nedbat/coveragepy/blob/master/NOTICE.txt</span><span class="strut">&nbsp;</span></p>
-<p id="t3" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t4" class="stm run hide_run"><span class="nam">m1a</span> <span class="op">=</span> <span class="num">1</span><span class="strut">&nbsp;</span></p>
-<p id="t5" class="stm run hide_run"><span class="nam">m1b</span> <span class="op">=</span> <span class="num">2</span><span class="strut">&nbsp;</span></p>
+<p id="t1" class="stm run hide_run"><span class="nam">m1a</span> <span class="op">=</span> <span class="num">1</span><span class="strut">&nbsp;</span></p>
+<p id="t2" class="stm run hide_run"><span class="nam">m1b</span> <span class="op">=</span> <span class="num">2</span><span class="strut">&nbsp;</span></p>
             </td>
         </tr>
     </table>
@@ -74,7 +68,7 @@
     <div class="content">
         <p>
             <a class="nav" href="index.html">&#xab; index</a> &nbsp; &nbsp; <a class="nav" href="https://coverage.readthedocs.io/en/coverage-5.0a2">coverage.py v5.0a2</a>,
-            created at 2018-06-29 15:43
+            created at 2018-08-22 19:42
         </p>
     </div>
 </div>
diff --git a/tests/farm/html/gold_omit_4/m3_py.html b/tests/farm/html/gold_omit_4/m3_py.html
index 2d1e1d4c..e5a9ebf7 100644
--- a/tests/farm/html/gold_omit_4/m3_py.html
+++ b/tests/farm/html/gold_omit_4/m3_py.html
@@ -54,18 +54,12 @@
     <table>
         <tr>
             <td class="linenos">
-<p id="n1" class="pln"><a href="#n1">1</a></p>
-<p id="n2" class="pln"><a href="#n2">2</a></p>
-<p id="n3" class="pln"><a href="#n3">3</a></p>
-<p id="n4" class="stm run hide_run"><a href="#n4">4</a></p>
-<p id="n5" class="stm run hide_run"><a href="#n5">5</a></p>
+<p id="n1" class="stm run hide_run"><a href="#n1">1</a></p>
+<p id="n2" class="stm run hide_run"><a href="#n2">2</a></p>
             </td>
             <td class="text">
-<p id="t1" class="pln"><span class="com"># Licensed under the Apache License: http://www.apache.org/licenses/LICENSE-2.0</span><span class="strut">&nbsp;</span></p>
-<p id="t2" class="pln"><span class="com"># For details: https://github.com/nedbat/coveragepy/blob/master/NOTICE.txt</span><span class="strut">&nbsp;</span></p>
-<p id="t3" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t4" class="stm run hide_run"><span class="nam">m3a</span> <span class="op">=</span> <span class="num">1</span><span class="strut">&nbsp;</span></p>
-<p id="t5" class="stm run hide_run"><span class="nam">m3b</span> <span class="op">=</span> <span class="num">2</span><span class="strut">&nbsp;</span></p>
+<p id="t1" class="stm run hide_run"><span class="nam">m3a</span> <span class="op">=</span> <span class="num">1</span><span class="strut">&nbsp;</span></p>
+<p id="t2" class="stm run hide_run"><span class="nam">m3b</span> <span class="op">=</span> <span class="num">2</span><span class="strut">&nbsp;</span></p>
             </td>
         </tr>
     </table>
@@ -74,7 +68,7 @@
     <div class="content">
         <p>
             <a class="nav" href="index.html">&#xab; index</a> &nbsp; &nbsp; <a class="nav" href="https://coverage.readthedocs.io/en/coverage-5.0a2">coverage.py v5.0a2</a>,
-            created at 2018-06-29 15:43
+            created at 2018-08-22 19:42
         </p>
     </div>
 </div>
diff --git a/tests/farm/html/gold_omit_4/main_py.html b/tests/farm/html/gold_omit_4/main_py.html
index bc93b1a0..cc763094 100644
--- a/tests/farm/html/gold_omit_4/main_py.html
+++ b/tests/farm/html/gold_omit_4/main_py.html
@@ -54,34 +54,28 @@
     <table>
         <tr>
             <td class="linenos">
-<p id="n1" class="pln"><a href="#n1">1</a></p>
-<p id="n2" class="pln"><a href="#n2">2</a></p>
-<p id="n3" class="pln"><a href="#n3">3</a></p>
-<p id="n4" class="stm run hide_run"><a href="#n4">4</a></p>
+<p id="n1" class="stm run hide_run"><a href="#n1">1</a></p>
+<p id="n2" class="stm run hide_run"><a href="#n2">2</a></p>
+<p id="n3" class="stm run hide_run"><a href="#n3">3</a></p>
+<p id="n4" class="pln"><a href="#n4">4</a></p>
 <p id="n5" class="stm run hide_run"><a href="#n5">5</a></p>
 <p id="n6" class="stm run hide_run"><a href="#n6">6</a></p>
 <p id="n7" class="pln"><a href="#n7">7</a></p>
 <p id="n8" class="stm run hide_run"><a href="#n8">8</a></p>
 <p id="n9" class="stm run hide_run"><a href="#n9">9</a></p>
-<p id="n10" class="pln"><a href="#n10">10</a></p>
-<p id="n11" class="stm run hide_run"><a href="#n11">11</a></p>
-<p id="n12" class="stm run hide_run"><a href="#n12">12</a></p>
-<p id="n13" class="stm run hide_run"><a href="#n13">13</a></p>
+<p id="n10" class="stm run hide_run"><a href="#n10">10</a></p>
             </td>
             <td class="text">
-<p id="t1" class="pln"><span class="com"># Licensed under the Apache License: http://www.apache.org/licenses/LICENSE-2.0</span><span class="strut">&nbsp;</span></p>
-<p id="t2" class="pln"><span class="com"># For details: https://github.com/nedbat/coveragepy/blob/master/NOTICE.txt</span><span class="strut">&nbsp;</span></p>
-<p id="t3" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t4" class="stm run hide_run"><span class="key">import</span> <span class="nam">m1</span><span class="strut">&nbsp;</span></p>
-<p id="t5" class="stm run hide_run"><span class="key">import</span> <span class="nam">m2</span><span class="strut">&nbsp;</span></p>
-<p id="t6" class="stm run hide_run"><span class="key">import</span> <span class="nam">m3</span><span class="strut">&nbsp;</span></p>
+<p id="t1" class="stm run hide_run"><span class="key">import</span> <span class="nam">m1</span><span class="strut">&nbsp;</span></p>
+<p id="t2" class="stm run hide_run"><span class="key">import</span> <span class="nam">m2</span><span class="strut">&nbsp;</span></p>
+<p id="t3" class="stm run hide_run"><span class="key">import</span> <span class="nam">m3</span><span class="strut">&nbsp;</span></p>
+<p id="t4" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t5" class="stm run hide_run"><span class="nam">a</span> <span class="op">=</span> <span class="num">5</span><span class="strut">&nbsp;</span></p>
+<p id="t6" class="stm run hide_run"><span class="nam">b</span> <span class="op">=</span> <span class="num">6</span><span class="strut">&nbsp;</span></p>
 <p id="t7" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t8" class="stm run hide_run"><span class="nam">a</span> <span class="op">=</span> <span class="num">5</span><span class="strut">&nbsp;</span></p>
-<p id="t9" class="stm run hide_run"><span class="nam">b</span> <span class="op">=</span> <span class="num">6</span><span class="strut">&nbsp;</span></p>
-<p id="t10" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t11" class="stm run hide_run"><span class="key">assert</span> <span class="nam">m1</span><span class="op">.</span><span class="nam">m1a</span> <span class="op">==</span> <span class="num">1</span><span class="strut">&nbsp;</span></p>
-<p id="t12" class="stm run hide_run"><span class="key">assert</span> <span class="nam">m2</span><span class="op">.</span><span class="nam">m2a</span> <span class="op">==</span> <span class="num">1</span><span class="strut">&nbsp;</span></p>
-<p id="t13" class="stm run hide_run"><span class="key">assert</span> <span class="nam">m3</span><span class="op">.</span><span class="nam">m3a</span> <span class="op">==</span> <span class="num">1</span><span class="strut">&nbsp;</span></p>
+<p id="t8" class="stm run hide_run"><span class="key">assert</span> <span class="nam">m1</span><span class="op">.</span><span class="nam">m1a</span> <span class="op">==</span> <span class="num">1</span><span class="strut">&nbsp;</span></p>
+<p id="t9" class="stm run hide_run"><span class="key">assert</span> <span class="nam">m2</span><span class="op">.</span><span class="nam">m2a</span> <span class="op">==</span> <span class="num">1</span><span class="strut">&nbsp;</span></p>
+<p id="t10" class="stm run hide_run"><span class="key">assert</span> <span class="nam">m3</span><span class="op">.</span><span class="nam">m3a</span> <span class="op">==</span> <span class="num">1</span><span class="strut">&nbsp;</span></p>
             </td>
         </tr>
     </table>
@@ -90,7 +84,7 @@
     <div class="content">
         <p>
             <a class="nav" href="index.html">&#xab; index</a> &nbsp; &nbsp; <a class="nav" href="https://coverage.readthedocs.io/en/coverage-5.0a2">coverage.py v5.0a2</a>,
-            created at 2018-06-29 15:43
+            created at 2018-08-22 19:42
         </p>
     </div>
 </div>
diff --git a/tests/farm/html/gold_omit_5/index.html b/tests/farm/html/gold_omit_5/index.html
index b9912d24..366b1b8b 100644
--- a/tests/farm/html/gold_omit_5/index.html
+++ b/tests/farm/html/gold_omit_5/index.html
@@ -83,7 +83,7 @@
     <div class="content">
         <p>
             <a class="nav" href="https://coverage.readthedocs.io/en/coverage-5.0a2">coverage.py v5.0a2</a>,
-            created at 2018-06-29 15:43
+            created at 2018-08-22 19:42
         </p>
     </div>
 </div>
diff --git a/tests/farm/html/gold_omit_5/m1_py.html b/tests/farm/html/gold_omit_5/m1_py.html
index 1557156c..9ea4648e 100644
--- a/tests/farm/html/gold_omit_5/m1_py.html
+++ b/tests/farm/html/gold_omit_5/m1_py.html
@@ -54,18 +54,12 @@
     <table>
         <tr>
             <td class="linenos">
-<p id="n1" class="pln"><a href="#n1">1</a></p>
-<p id="n2" class="pln"><a href="#n2">2</a></p>
-<p id="n3" class="pln"><a href="#n3">3</a></p>
-<p id="n4" class="stm run hide_run"><a href="#n4">4</a></p>
-<p id="n5" class="stm run hide_run"><a href="#n5">5</a></p>
+<p id="n1" class="stm run hide_run"><a href="#n1">1</a></p>
+<p id="n2" class="stm run hide_run"><a href="#n2">2</a></p>
             </td>
             <td class="text">
-<p id="t1" class="pln"><span class="com"># Licensed under the Apache License: http://www.apache.org/licenses/LICENSE-2.0</span><span class="strut">&nbsp;</span></p>
-<p id="t2" class="pln"><span class="com"># For details: https://github.com/nedbat/coveragepy/blob/master/NOTICE.txt</span><span class="strut">&nbsp;</span></p>
-<p id="t3" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t4" class="stm run hide_run"><span class="nam">m1a</span> <span class="op">=</span> <span class="num">1</span><span class="strut">&nbsp;</span></p>
-<p id="t5" class="stm run hide_run"><span class="nam">m1b</span> <span class="op">=</span> <span class="num">2</span><span class="strut">&nbsp;</span></p>
+<p id="t1" class="stm run hide_run"><span class="nam">m1a</span> <span class="op">=</span> <span class="num">1</span><span class="strut">&nbsp;</span></p>
+<p id="t2" class="stm run hide_run"><span class="nam">m1b</span> <span class="op">=</span> <span class="num">2</span><span class="strut">&nbsp;</span></p>
             </td>
         </tr>
     </table>
@@ -74,7 +68,7 @@
     <div class="content">
         <p>
             <a class="nav" href="index.html">&#xab; index</a> &nbsp; &nbsp; <a class="nav" href="https://coverage.readthedocs.io/en/coverage-5.0a2">coverage.py v5.0a2</a>,
-            created at 2018-06-29 15:43
+            created at 2018-08-22 19:42
         </p>
     </div>
 </div>
diff --git a/tests/farm/html/gold_omit_5/main_py.html b/tests/farm/html/gold_omit_5/main_py.html
index bc93b1a0..cc763094 100644
--- a/tests/farm/html/gold_omit_5/main_py.html
+++ b/tests/farm/html/gold_omit_5/main_py.html
@@ -54,34 +54,28 @@
     <table>
         <tr>
             <td class="linenos">
-<p id="n1" class="pln"><a href="#n1">1</a></p>
-<p id="n2" class="pln"><a href="#n2">2</a></p>
-<p id="n3" class="pln"><a href="#n3">3</a></p>
-<p id="n4" class="stm run hide_run"><a href="#n4">4</a></p>
+<p id="n1" class="stm run hide_run"><a href="#n1">1</a></p>
+<p id="n2" class="stm run hide_run"><a href="#n2">2</a></p>
+<p id="n3" class="stm run hide_run"><a href="#n3">3</a></p>
+<p id="n4" class="pln"><a href="#n4">4</a></p>
 <p id="n5" class="stm run hide_run"><a href="#n5">5</a></p>
 <p id="n6" class="stm run hide_run"><a href="#n6">6</a></p>
 <p id="n7" class="pln"><a href="#n7">7</a></p>
 <p id="n8" class="stm run hide_run"><a href="#n8">8</a></p>
 <p id="n9" class="stm run hide_run"><a href="#n9">9</a></p>
-<p id="n10" class="pln"><a href="#n10">10</a></p>
-<p id="n11" class="stm run hide_run"><a href="#n11">11</a></p>
-<p id="n12" class="stm run hide_run"><a href="#n12">12</a></p>
-<p id="n13" class="stm run hide_run"><a href="#n13">13</a></p>
+<p id="n10" class="stm run hide_run"><a href="#n10">10</a></p>
             </td>
             <td class="text">
-<p id="t1" class="pln"><span class="com"># Licensed under the Apache License: http://www.apache.org/licenses/LICENSE-2.0</span><span class="strut">&nbsp;</span></p>
-<p id="t2" class="pln"><span class="com"># For details: https://github.com/nedbat/coveragepy/blob/master/NOTICE.txt</span><span class="strut">&nbsp;</span></p>
-<p id="t3" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t4" class="stm run hide_run"><span class="key">import</span> <span class="nam">m1</span><span class="strut">&nbsp;</span></p>
-<p id="t5" class="stm run hide_run"><span class="key">import</span> <span class="nam">m2</span><span class="strut">&nbsp;</span></p>
-<p id="t6" class="stm run hide_run"><span class="key">import</span> <span class="nam">m3</span><span class="strut">&nbsp;</span></p>
+<p id="t1" class="stm run hide_run"><span class="key">import</span> <span class="nam">m1</span><span class="strut">&nbsp;</span></p>
+<p id="t2" class="stm run hide_run"><span class="key">import</span> <span class="nam">m2</span><span class="strut">&nbsp;</span></p>
+<p id="t3" class="stm run hide_run"><span class="key">import</span> <span class="nam">m3</span><span class="strut">&nbsp;</span></p>
+<p id="t4" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t5" class="stm run hide_run"><span class="nam">a</span> <span class="op">=</span> <span class="num">5</span><span class="strut">&nbsp;</span></p>
+<p id="t6" class="stm run hide_run"><span class="nam">b</span> <span class="op">=</span> <span class="num">6</span><span class="strut">&nbsp;</span></p>
 <p id="t7" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t8" class="stm run hide_run"><span class="nam">a</span> <span class="op">=</span> <span class="num">5</span><span class="strut">&nbsp;</span></p>
-<p id="t9" class="stm run hide_run"><span class="nam">b</span> <span class="op">=</span> <span class="num">6</span><span class="strut">&nbsp;</span></p>
-<p id="t10" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t11" class="stm run hide_run"><span class="key">assert</span> <span class="nam">m1</span><span class="op">.</span><span class="nam">m1a</span> <span class="op">==</span> <span class="num">1</span><span class="strut">&nbsp;</span></p>
-<p id="t12" class="stm run hide_run"><span class="key">assert</span> <span class="nam">m2</span><span class="op">.</span><span class="nam">m2a</span> <span class="op">==</span> <span class="num">1</span><span class="strut">&nbsp;</span></p>
-<p id="t13" class="stm run hide_run"><span class="key">assert</span> <span class="nam">m3</span><span class="op">.</span><span class="nam">m3a</span> <span class="op">==</span> <span class="num">1</span><span class="strut">&nbsp;</span></p>
+<p id="t8" class="stm run hide_run"><span class="key">assert</span> <span class="nam">m1</span><span class="op">.</span><span class="nam">m1a</span> <span class="op">==</span> <span class="num">1</span><span class="strut">&nbsp;</span></p>
+<p id="t9" class="stm run hide_run"><span class="key">assert</span> <span class="nam">m2</span><span class="op">.</span><span class="nam">m2a</span> <span class="op">==</span> <span class="num">1</span><span class="strut">&nbsp;</span></p>
+<p id="t10" class="stm run hide_run"><span class="key">assert</span> <span class="nam">m3</span><span class="op">.</span><span class="nam">m3a</span> <span class="op">==</span> <span class="num">1</span><span class="strut">&nbsp;</span></p>
             </td>
         </tr>
     </table>
@@ -90,7 +84,7 @@
     <div class="content">
         <p>
             <a class="nav" href="index.html">&#xab; index</a> &nbsp; &nbsp; <a class="nav" href="https://coverage.readthedocs.io/en/coverage-5.0a2">coverage.py v5.0a2</a>,
-            created at 2018-06-29 15:43
+            created at 2018-08-22 19:42
         </p>
     </div>
 </div>
diff --git a/tests/farm/html/gold_other/blah_blah_other_py.html b/tests/farm/html/gold_other/blah_blah_other_py.html
index fb45d0bf..4d083808 100644
--- a/tests/farm/html/gold_other/blah_blah_other_py.html
+++ b/tests/farm/html/gold_other/blah_blah_other_py.html
@@ -3,7 +3,7 @@
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=emulateIE7" />
-    <title>Coverage for /private/var/folders/j2/gr3cj3jn63s5q8g3bjvw57hm0000gp/T/coverage_test/tests_test_html_HtmlGoldTests_test_other_81055852/othersrc/other.py: 100%</title>
+    <title>Coverage for /private/var/folders/j2/gr3cj3jn63s5q8g3bjvw57hm0000gp/T/coverage_test/tests_test_html_HtmlGoldTests_test_other_42705243/othersrc/other.py: 100%</title>
     <link rel="stylesheet" href="style.css" type="text/css">
     <script type="text/javascript" src="jquery.min.js"></script>
     <script type="text/javascript" src="jquery.hotkeys.js"></script>
@@ -16,7 +16,7 @@
 <body class="pyfile">
 <div id="header">
     <div class="content">
-        <h1>Coverage for <b>/private/var/folders/j2/gr3cj3jn63s5q8g3bjvw57hm0000gp/T/coverage_test/tests_test_html_HtmlGoldTests_test_other_81055852/othersrc/other.py</b> :
+        <h1>Coverage for <b>/private/var/folders/j2/gr3cj3jn63s5q8g3bjvw57hm0000gp/T/coverage_test/tests_test_html_HtmlGoldTests_test_other_42705243/othersrc/other.py</b> :
             <span class="pc_cov">100%</span>
         </h1>
         <img id="keyboard_icon" src="keybd_closed.png" alt="Show keyboard shortcuts" />
@@ -57,19 +57,13 @@
 <p id="n1" class="pln"><a href="#n1">1</a></p>
 <p id="n2" class="pln"><a href="#n2">2</a></p>
 <p id="n3" class="pln"><a href="#n3">3</a></p>
-<p id="n4" class="pln"><a href="#n4">4</a></p>
-<p id="n5" class="pln"><a href="#n5">5</a></p>
-<p id="n6" class="pln"><a href="#n6">6</a></p>
-<p id="n7" class="stm run hide_run"><a href="#n7">7</a></p>
+<p id="n4" class="stm run hide_run"><a href="#n4">4</a></p>
             </td>
             <td class="text">
-<p id="t1" class="pln"><span class="com"># Licensed under the Apache License: http://www.apache.org/licenses/LICENSE-2.0</span><span class="strut">&nbsp;</span></p>
-<p id="t2" class="pln"><span class="com"># For details: https://github.com/nedbat/coveragepy/blob/master/NOTICE.txt</span><span class="strut">&nbsp;</span></p>
+<p id="t1" class="pln"><span class="com"># A file in another directory.  We're checking that it ends up in the</span><span class="strut">&nbsp;</span></p>
+<p id="t2" class="pln"><span class="com"># HTML report.</span><span class="strut">&nbsp;</span></p>
 <p id="t3" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t4" class="pln"><span class="com"># A file in another directory.  We're checking that it ends up in the</span><span class="strut">&nbsp;</span></p>
-<p id="t5" class="pln"><span class="com"># HTML report.</span><span class="strut">&nbsp;</span></p>
-<p id="t6" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t7" class="stm run hide_run"><span class="nam">print</span><span class="op">(</span><span class="str">"This is the other src!"</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t4" class="stm run hide_run"><span class="nam">print</span><span class="op">(</span><span class="str">"This is the other src!"</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
             </td>
         </tr>
     </table>
@@ -78,7 +72,7 @@
     <div class="content">
         <p>
             <a class="nav" href="index.html">&#xab; index</a> &nbsp; &nbsp; <a class="nav" href="https://coverage.readthedocs.io/en/coverage-5.0a2">coverage.py v5.0a2</a>,
-            created at 2018-08-22 19:08
+            created at 2018-08-22 19:42
         </p>
     </div>
 </div>
diff --git a/tests/farm/html/gold_other/here_py.html b/tests/farm/html/gold_other/here_py.html
index c692a1c4..26213c92 100644
--- a/tests/farm/html/gold_other/here_py.html
+++ b/tests/farm/html/gold_other/here_py.html
@@ -54,30 +54,20 @@
     <table>
         <tr>
             <td class="linenos">
-<p id="n1" class="pln"><a href="#n1">1</a></p>
+<p id="n1" class="stm run hide_run"><a href="#n1">1</a></p>
 <p id="n2" class="pln"><a href="#n2">2</a></p>
-<p id="n3" class="pln"><a href="#n3">3</a></p>
-<p id="n4" class="pln"><a href="#n4">4</a></p>
+<p id="n3" class="stm run hide_run"><a href="#n3">3</a></p>
+<p id="n4" class="stm run hide_run"><a href="#n4">4</a></p>
 <p id="n5" class="pln"><a href="#n5">5</a></p>
-<p id="n6" class="stm run hide_run"><a href="#n6">6</a></p>
-<p id="n7" class="pln"><a href="#n7">7</a></p>
-<p id="n8" class="stm run hide_run"><a href="#n8">8</a></p>
-<p id="n9" class="stm run hide_run"><a href="#n9">9</a></p>
-<p id="n10" class="pln"><a href="#n10">10</a></p>
-<p id="n11" class="stm mis"><a href="#n11">11</a></p>
+<p id="n6" class="stm mis"><a href="#n6">6</a></p>
             </td>
             <td class="text">
-<p id="t1" class="pln"><span class="com"># Licensed under the Apache License: http://www.apache.org/licenses/LICENSE-2.0</span><span class="strut">&nbsp;</span></p>
-<p id="t2" class="pln"><span class="com"># For details: https://github.com/nedbat/coveragepy/blob/master/NOTICE.txt</span><span class="strut">&nbsp;</span></p>
-<p id="t3" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t4" class="pln"><span class="com"># A test file for HTML reporting by coverage.py.</span><span class="strut">&nbsp;</span></p>
-<p id="t5" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t6" class="stm run hide_run"><span class="key">import</span> <span class="nam">other</span><span class="strut">&nbsp;</span></p>
-<p id="t7" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t8" class="stm run hide_run"><span class="key">if</span> <span class="num">1</span> <span class="op">&lt;</span> <span class="num">2</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t9" class="stm run hide_run">    <span class="nam">h</span> <span class="op">=</span> <span class="num">3</span><span class="strut">&nbsp;</span></p>
-<p id="t10" class="pln"><span class="key">else</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t11" class="stm mis">    <span class="nam">h</span> <span class="op">=</span> <span class="num">4</span><span class="strut">&nbsp;</span></p>
+<p id="t1" class="stm run hide_run"><span class="key">import</span> <span class="nam">other</span><span class="strut">&nbsp;</span></p>
+<p id="t2" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t3" class="stm run hide_run"><span class="key">if</span> <span class="num">1</span> <span class="op">&lt;</span> <span class="num">2</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t4" class="stm run hide_run">    <span class="nam">h</span> <span class="op">=</span> <span class="num">3</span><span class="strut">&nbsp;</span></p>
+<p id="t5" class="pln"><span class="key">else</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t6" class="stm mis">    <span class="nam">h</span> <span class="op">=</span> <span class="num">4</span><span class="strut">&nbsp;</span></p>
             </td>
         </tr>
     </table>
@@ -86,7 +76,7 @@
     <div class="content">
         <p>
             <a class="nav" href="index.html">&#xab; index</a> &nbsp; &nbsp; <a class="nav" href="https://coverage.readthedocs.io/en/coverage-5.0a2">coverage.py v5.0a2</a>,
-            created at 2018-06-29 15:43
+            created at 2018-08-22 19:42
         </p>
     </div>
 </div>
diff --git a/tests/farm/html/gold_other/index.html b/tests/farm/html/gold_other/index.html
index a9c3d4cb..18edab71 100644
--- a/tests/farm/html/gold_other/index.html
+++ b/tests/farm/html/gold_other/index.html
@@ -60,7 +60,7 @@
         </tfoot>
         <tbody>
             <tr class="file">
-                <td class="name left"><a href="_private_var_folders_j2_gr3cj3jn63s5q8g3bjvw57hm0000gp_T_coverage_test_tests_test_html_HtmlGoldTests_test_other_81055852_othersrc_other_py.html">/private/var/folders/j2/gr3cj3jn63s5q8g3bjvw57hm0000gp/T/coverage_test/tests_test_html_HtmlGoldTests_test_other_81055852/othersrc/other.py</a></td>
+                <td class="name left"><a href="_private_var_folders_j2_gr3cj3jn63s5q8g3bjvw57hm0000gp_T_coverage_test_tests_test_html_HtmlGoldTests_test_other_42705243_othersrc_other_py.html">/private/var/folders/j2/gr3cj3jn63s5q8g3bjvw57hm0000gp/T/coverage_test/tests_test_html_HtmlGoldTests_test_other_42705243/othersrc/other.py</a></td>
                 <td>1</td>
                 <td>0</td>
                 <td>0</td>
@@ -83,7 +83,7 @@
     <div class="content">
         <p>
             <a class="nav" href="https://coverage.readthedocs.io/en/coverage-5.0a2">coverage.py v5.0a2</a>,
-            created at 2018-08-22 19:08
+            created at 2018-08-22 19:42
         </p>
     </div>
 </div>
diff --git a/tests/farm/html/gold_partial/index.html b/tests/farm/html/gold_partial/index.html
index ca8919d7..b0addf9c 100644
--- a/tests/farm/html/gold_partial/index.html
+++ b/tests/farm/html/gold_partial/index.html
@@ -84,7 +84,7 @@
     <div class="content">
         <p>
             <a class="nav" href="https://coverage.readthedocs.io/en/coverage-5.0a2">coverage.py v5.0a2</a>,
-            created at 2018-06-29 15:43
+            created at 2018-08-22 19:42
         </p>
     </div>
 </div>
diff --git a/tests/farm/html/gold_partial/partial_py.html b/tests/farm/html/gold_partial/partial_py.html
index 7f4ed31a..c792ff75 100644
--- a/tests/farm/html/gold_partial/partial_py.html
+++ b/tests/farm/html/gold_partial/partial_py.html
@@ -56,55 +56,47 @@
         <tr>
             <td class="linenos">
 <p id="n1" class="pln"><a href="#n1">1</a></p>
-<p id="n2" class="pln"><a href="#n2">2</a></p>
+<p id="n2" class="stm run hide_run"><a href="#n2">2</a></p>
 <p id="n3" class="pln"><a href="#n3">3</a></p>
-<p id="n4" class="pln"><a href="#n4">4</a></p>
-<p id="n5" class="pln"><a href="#n5">5</a></p>
-<p id="n6" class="stm run hide_run"><a href="#n6">6</a></p>
-<p id="n7" class="pln"><a href="#n7">7</a></p>
+<p id="n4" class="stm run hide_run"><a href="#n4">4</a></p>
+<p id="n5" class="stm run hide_run"><a href="#n5">5</a></p>
+<p id="n6" class="pln"><a href="#n6">6</a></p>
+<p id="n7" class="stm run hide_run"><a href="#n7">7</a></p>
 <p id="n8" class="stm run hide_run"><a href="#n8">8</a></p>
-<p id="n9" class="stm run hide_run"><a href="#n9">9</a></p>
-<p id="n10" class="pln"><a href="#n10">10</a></p>
+<p id="n9" class="pln"><a href="#n9">9</a></p>
+<p id="n10" class="stm run hide_run"><a href="#n10">10</a></p>
 <p id="n11" class="stm run hide_run"><a href="#n11">11</a></p>
-<p id="n12" class="stm run hide_run"><a href="#n12">12</a></p>
+<p id="n12" class="pln"><a href="#n12">12</a></p>
 <p id="n13" class="pln"><a href="#n13">13</a></p>
-<p id="n14" class="stm run hide_run"><a href="#n14">14</a></p>
-<p id="n15" class="stm run hide_run"><a href="#n15">15</a></p>
+<p id="n14" class="pln"><a href="#n14">14</a></p>
+<p id="n15" class="pln"><a href="#n15">15</a></p>
 <p id="n16" class="pln"><a href="#n16">16</a></p>
-<p id="n17" class="pln"><a href="#n17">17</a></p>
+<p id="n17" class="stm run hide_run"><a href="#n17">17</a></p>
 <p id="n18" class="pln"><a href="#n18">18</a></p>
-<p id="n19" class="pln"><a href="#n19">19</a></p>
-<p id="n20" class="pln"><a href="#n20">20</a></p>
-<p id="n21" class="stm run hide_run"><a href="#n21">21</a></p>
-<p id="n22" class="pln"><a href="#n22">22</a></p>
-<p id="n23" class="stm run hide_run"><a href="#n23">23</a></p>
-<p id="n24" class="exc"><a href="#n24">24</a></p>
+<p id="n19" class="stm run hide_run"><a href="#n19">19</a></p>
+<p id="n20" class="exc"><a href="#n20">20</a></p>
             </td>
             <td class="text">
-<p id="t1" class="pln"><span class="com"># Licensed under the Apache License: http://www.apache.org/licenses/LICENSE-2.0</span><span class="strut">&nbsp;</span></p>
-<p id="t2" class="pln"><span class="com"># For details: https://github.com/nedbat/coveragepy/blob/master/NOTICE.txt</span><span class="strut">&nbsp;</span></p>
+<p id="t1" class="pln"><span class="com"># partial branches and excluded lines</span><span class="strut">&nbsp;</span></p>
+<p id="t2" class="stm run hide_run"><span class="nam">a</span> <span class="op">=</span> <span class="num">6</span><span class="strut">&nbsp;</span></p>
 <p id="t3" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t4" class="pln"><span class="com"># partial branches and excluded lines</span><span class="strut">&nbsp;</span></p>
-<p id="t5" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t6" class="stm run hide_run"><span class="nam">a</span> <span class="op">=</span> <span class="num">6</span><span class="strut">&nbsp;</span></p>
-<p id="t7" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t8" class="stm run hide_run"><span class="key">while</span> <span class="key">True</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t9" class="stm run hide_run">    <span class="key">break</span><span class="strut">&nbsp;</span></p>
-<p id="t10" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t11" class="stm run hide_run"><span class="key">while</span> <span class="num">1</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t12" class="stm run hide_run">    <span class="key">break</span><span class="strut">&nbsp;</span></p>
-<p id="t13" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t14" class="stm run hide_run"><span class="key">while</span> <span class="nam">a</span><span class="op">:</span>        <span class="com"># pragma: no branch</span><span class="strut">&nbsp;</span></p>
-<p id="t15" class="stm run hide_run">    <span class="key">break</span><span class="strut">&nbsp;</span></p>
-<p id="t16" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t17" class="pln"><span class="key">if</span> <span class="num">0</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t18" class="pln">    <span class="nam">never_happen</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
-<p id="t19" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t20" class="pln"><span class="key">if</span> <span class="num">1</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t21" class="stm run hide_run">    <span class="nam">a</span> <span class="op">=</span> <span class="num">21</span><span class="strut">&nbsp;</span></p>
-<p id="t22" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t23" class="stm run hide_run"><span class="key">if</span> <span class="nam">a</span> <span class="op">==</span> <span class="num">23</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t24" class="exc">    <span class="key">raise</span> <span class="nam">AssertionError</span><span class="op">(</span><span class="str">"Can't"</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t4" class="stm run hide_run"><span class="key">while</span> <span class="key">True</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t5" class="stm run hide_run">    <span class="key">break</span><span class="strut">&nbsp;</span></p>
+<p id="t6" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t7" class="stm run hide_run"><span class="key">while</span> <span class="num">1</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t8" class="stm run hide_run">    <span class="key">break</span><span class="strut">&nbsp;</span></p>
+<p id="t9" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t10" class="stm run hide_run"><span class="key">while</span> <span class="nam">a</span><span class="op">:</span>        <span class="com"># pragma: no branch</span><span class="strut">&nbsp;</span></p>
+<p id="t11" class="stm run hide_run">    <span class="key">break</span><span class="strut">&nbsp;</span></p>
+<p id="t12" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t13" class="pln"><span class="key">if</span> <span class="num">0</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t14" class="pln">    <span class="nam">never_happen</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t15" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t16" class="pln"><span class="key">if</span> <span class="num">1</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t17" class="stm run hide_run">    <span class="nam">a</span> <span class="op">=</span> <span class="num">21</span><span class="strut">&nbsp;</span></p>
+<p id="t18" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t19" class="stm run hide_run"><span class="key">if</span> <span class="nam">a</span> <span class="op">==</span> <span class="num">23</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t20" class="exc">    <span class="key">raise</span> <span class="nam">AssertionError</span><span class="op">(</span><span class="str">"Can't"</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
             </td>
         </tr>
     </table>
@@ -113,7 +105,7 @@
     <div class="content">
         <p>
             <a class="nav" href="index.html">&#xab; index</a> &nbsp; &nbsp; <a class="nav" href="https://coverage.readthedocs.io/en/coverage-5.0a2">coverage.py v5.0a2</a>,
-            created at 2018-06-29 15:43
+            created at 2018-08-22 19:42
         </p>
     </div>
 </div>
diff --git a/tests/farm/html/gold_styled/a_py.html b/tests/farm/html/gold_styled/a_py.html
index 6e6f317c..65f35d6e 100644
--- a/tests/farm/html/gold_styled/a_py.html
+++ b/tests/farm/html/gold_styled/a_py.html
@@ -55,28 +55,18 @@
     <table>
         <tr>
             <td class="linenos">
-<p id="n1" class="pln"><a href="#n1">1</a></p>
+<p id="n1" class="stm run hide_run"><a href="#n1">1</a></p>
 <p id="n2" class="pln"><a href="#n2">2</a></p>
-<p id="n3" class="pln"><a href="#n3">3</a></p>
+<p id="n3" class="stm run hide_run"><a href="#n3">3</a></p>
 <p id="n4" class="pln"><a href="#n4">4</a></p>
-<p id="n5" class="pln"><a href="#n5">5</a></p>
-<p id="n6" class="stm run hide_run"><a href="#n6">6</a></p>
-<p id="n7" class="pln"><a href="#n7">7</a></p>
-<p id="n8" class="stm run hide_run"><a href="#n8">8</a></p>
-<p id="n9" class="pln"><a href="#n9">9</a></p>
-<p id="n10" class="stm mis"><a href="#n10">10</a></p>
+<p id="n5" class="stm mis"><a href="#n5">5</a></p>
             </td>
             <td class="text">
-<p id="t1" class="pln"><span class="com"># Licensed under the Apache License: http://www.apache.org/licenses/LICENSE-2.0</span><span class="strut">&nbsp;</span></p>
-<p id="t2" class="pln"><span class="com"># For details: https://github.com/nedbat/coveragepy/blob/master/NOTICE.txt</span><span class="strut">&nbsp;</span></p>
-<p id="t3" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t4" class="pln"><span class="com"># A test file for HTML reporting by coverage.py.</span><span class="strut">&nbsp;</span></p>
-<p id="t5" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t6" class="stm run hide_run"><span class="key">if</span> <span class="num">1</span> <span class="op">&lt;</span> <span class="num">2</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t7" class="pln">    <span class="com"># Needed a &lt; to look at HTML entities.</span><span class="strut">&nbsp;</span></p>
-<p id="t8" class="stm run hide_run">    <span class="nam">a</span> <span class="op">=</span> <span class="num">3</span><span class="strut">&nbsp;</span></p>
-<p id="t9" class="pln"><span class="key">else</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t10" class="stm mis">    <span class="nam">a</span> <span class="op">=</span> <span class="num">4</span><span class="strut">&nbsp;</span></p>
+<p id="t1" class="stm run hide_run"><span class="key">if</span> <span class="num">1</span> <span class="op">&lt;</span> <span class="num">2</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t2" class="pln">    <span class="com"># Needed a &lt; to look at HTML entities.</span><span class="strut">&nbsp;</span></p>
+<p id="t3" class="stm run hide_run">    <span class="nam">a</span> <span class="op">=</span> <span class="num">3</span><span class="strut">&nbsp;</span></p>
+<p id="t4" class="pln"><span class="key">else</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t5" class="stm mis">    <span class="nam">a</span> <span class="op">=</span> <span class="num">4</span><span class="strut">&nbsp;</span></p>
             </td>
         </tr>
     </table>
@@ -85,7 +75,7 @@
     <div class="content">
         <p>
             <a class="nav" href="index.html">&#xab; index</a> &nbsp; &nbsp; <a class="nav" href="https://coverage.readthedocs.io/en/coverage-5.0a2">coverage.py v5.0a2</a>,
-            created at 2018-06-29 15:42
+            created at 2018-08-22 19:42
         </p>
     </div>
 </div>
diff --git a/tests/farm/html/gold_styled/index.html b/tests/farm/html/gold_styled/index.html
index c0881592..e5c36b95 100644
--- a/tests/farm/html/gold_styled/index.html
+++ b/tests/farm/html/gold_styled/index.html
@@ -77,7 +77,7 @@
     <div class="content">
         <p>
             <a class="nav" href="https://coverage.readthedocs.io/en/coverage-5.0a2">coverage.py v5.0a2</a>,
-            created at 2018-06-29 15:42
+            created at 2018-08-22 19:42
         </p>
     </div>
 </div>
diff --git a/tests/farm/html/gold_unicode/index.html b/tests/farm/html/gold_unicode/index.html
index c1f2fb67..ff722dc9 100644
--- a/tests/farm/html/gold_unicode/index.html
+++ b/tests/farm/html/gold_unicode/index.html
@@ -76,7 +76,7 @@
     <div class="content">
         <p>
             <a class="nav" href="https://coverage.readthedocs.io/en/coverage-5.0a2">coverage.py v5.0a2</a>,
-            created at 2018-06-29 15:42
+            created at 2018-08-22 19:42
         </p>
     </div>
 </div>
diff --git a/tests/farm/html/gold_unicode/unicode_py.html b/tests/farm/html/gold_unicode/unicode_py.html
index 7708f22e..8207d798 100644
--- a/tests/farm/html/gold_unicode/unicode_py.html
+++ b/tests/farm/html/gold_unicode/unicode_py.html
@@ -57,21 +57,15 @@
 <p id="n1" class="pln"><a href="#n1">1</a></p>
 <p id="n2" class="pln"><a href="#n2">2</a></p>
 <p id="n3" class="pln"><a href="#n3">3</a></p>
-<p id="n4" class="pln"><a href="#n4">4</a></p>
-<p id="n5" class="pln"><a href="#n5">5</a></p>
-<p id="n6" class="pln"><a href="#n6">6</a></p>
-<p id="n7" class="stm run hide_run"><a href="#n7">7</a></p>
-<p id="n8" class="stm run hide_run"><a href="#n8">8</a></p>
+<p id="n4" class="stm run hide_run"><a href="#n4">4</a></p>
+<p id="n5" class="stm run hide_run"><a href="#n5">5</a></p>
             </td>
             <td class="text">
 <p id="t1" class="pln"><span class="com"># -*- coding: utf-8 -*-</span><span class="strut">&nbsp;</span></p>
-<p id="t2" class="pln"><span class="com"># Licensed under the Apache License: http://www.apache.org/licenses/LICENSE-2.0</span><span class="strut">&nbsp;</span></p>
-<p id="t3" class="pln"><span class="com"># For details: https://github.com/nedbat/coveragepy/blob/master/NOTICE.txt</span><span class="strut">&nbsp;</span></p>
-<p id="t4" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t5" class="pln"><span class="com"># A Python source file with exotic characters.</span><span class="strut">&nbsp;</span></p>
-<p id="t6" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t7" class="stm run hide_run"><span class="nam">upside_down</span> <span class="op">=</span> <span class="str">"&#654;d&#729;&#477;b&#592;&#633;&#477;&#652;o&#596;"</span><span class="strut">&nbsp;</span></p>
-<p id="t8" class="stm run hide_run"><span class="nam">surrogate</span> <span class="op">=</span> <span class="str">"db40,dd00: x&#917760;"</span><span class="strut">&nbsp;</span></p>
+<p id="t2" class="pln"><span class="com"># A Python source file with exotic characters.</span><span class="strut">&nbsp;</span></p>
+<p id="t3" class="pln"><span class="strut">&nbsp;</span></p>
+<p id="t4" class="stm run hide_run"><span class="nam">upside_down</span> <span class="op">=</span> <span class="str">"&#654;d&#729;&#477;b&#592;&#633;&#477;&#652;o&#596;"</span><span class="strut">&nbsp;</span></p>
+<p id="t5" class="stm run hide_run"><span class="nam">surrogate</span> <span class="op">=</span> <span class="str">"db40,dd00: x&#917760;"</span><span class="strut">&nbsp;</span></p>
             </td>
         </tr>
     </table>
@@ -80,7 +74,7 @@
     <div class="content">
         <p>
             <a class="nav" href="index.html">&#xab; index</a> &nbsp; &nbsp; <a class="nav" href="https://coverage.readthedocs.io/en/coverage-5.0a2">coverage.py v5.0a2</a>,
-            created at 2018-06-29 15:42
+            created at 2018-08-22 19:42
         </p>
     </div>
 </div>
diff --git a/tests/test_html.py b/tests/test_html.py
index 07ddba82..b4dd4606 100644
--- a/tests/test_html.py
+++ b/tests/test_html.py
@@ -596,11 +596,6 @@ class HtmlGoldTests(CoverageTest):
 
     def test_a(self):
         self.make_file("a.py", """\
-            # Licensed under the Apache License: http://www.apache.org/licenses/LICENSE-2.0
-            # For details: https://github.com/nedbat/coveragepy/blob/master/NOTICE.txt
-
-            # A test file for HTML reporting by coverage.py.
-
             if 1 < 2:
                 # Needed a < to look at HTML entities.
                 a = 3
@@ -632,11 +627,6 @@ class HtmlGoldTests(CoverageTest):
 
     def test_b_branch(self):
         self.make_file("b.py", """\
-            # Licensed under the Apache License: http://www.apache.org/licenses/LICENSE-2.0
-            # For details: https://github.com/nedbat/coveragepy/blob/master/NOTICE.txt
-
-            # A test file for HTML reporting by coverage.py.
-
             def one(x):
                 # This will be a branch that misses the else.
                 if x < 2:
@@ -680,19 +670,20 @@ class HtmlGoldTests(CoverageTest):
             ('    <span class="nam">a</span> <span class="op">=</span> '
              '<span class="num">3</span>'),
             '<span class="pc_cov">70%</span>',
-            ('<span class="annotate short">8&#x202F;&#x219B;&#x202F;11</span>'
-             '<span class="annotate long">line 8 didn\'t jump to line 11, '
-                            'because the condition on line 8 was never false</span>'),
-            ('<span class="annotate short">17&#x202F;&#x219B;&#x202F;exit</span>'
-             '<span class="annotate long">line 17 didn\'t return from function \'two\', '
-                            'because the condition on line 17 was never false</span>'),
-            ('<span class="annotate short">25&#x202F;&#x219B;&#x202F;26,&nbsp;&nbsp; '
-                            '25&#x202F;&#x219B;&#x202F;28</span>'
+
+            ('<span class="annotate short">3&#x202F;&#x219B;&#x202F;6</span>'
+             '<span class="annotate long">line 3 didn\'t jump to line 6, '
+                            'because the condition on line 3 was never false</span>'),
+            ('<span class="annotate short">12&#x202F;&#x219B;&#x202F;exit</span>'
+             '<span class="annotate long">line 12 didn\'t return from function \'two\', '
+                            'because the condition on line 12 was never false</span>'),
+            ('<span class="annotate short">20&#x202F;&#x219B;&#x202F;21,&nbsp;&nbsp; '
+                            '20&#x202F;&#x219B;&#x202F;23</span>'
              '<span class="annotate long">2 missed branches: '
-                            '1) line 25 didn\'t jump to line 26, '
-                                'because the condition on line 25 was never true, '
-                            '2) line 25 didn\'t jump to line 28, '
-                                'because the condition on line 25 was never false</span>'),
+                            '1) line 20 didn\'t jump to line 21, '
+                                'because the condition on line 20 was never true, '
+                            '2) line 20 didn\'t jump to line 23, '
+                                'because the condition on line 20 was never false</span>'),
         )
         contains(
             "out/index.html",
@@ -703,10 +694,7 @@ class HtmlGoldTests(CoverageTest):
 
     def test_bom(self):
         self.make_file("bom.py", bytes=b"""\
-\xef\xbb\xbf# Licensed under the Apache License: http://www.apache.org/licenses/LICENSE-2.0
-# For details: https://github.com/nedbat/coveragepy/blob/master/NOTICE.txt
-
-# A Python source file in utf-8, with BOM.
+\xef\xbb\xbf# A Python source file in utf-8, with BOM.
 math = "3\xc3\x974 = 12, \xc3\xb72 = 6\xc2\xb10"
 
 import sys
@@ -725,7 +713,7 @@ else:
         with open("bom.py", "rb") as f:
             data = f.read()
             assert data[:3] == b"\xef\xbb\xbf"
-            assert data.count(b"\r\n") == 14
+            assert data.count(b"\r\n") == 11
 
         cov = coverage.Coverage()
         cov.start()
@@ -742,9 +730,6 @@ else:
     def test_isolatin1(self):
         self.make_file("isolatin1.py", bytes=b"""\
 # -*- coding: iso8859-1 -*-
-# Licensed under the Apache License: http://www.apache.org/licenses/LICENSE-2.0
-# For details: https://github.com/nedbat/coveragepy/blob/master/NOTICE.txt
-
 # A Python source file in another encoding.
 
 math = "3\xd74 = 12, \xf72 = 6\xb10"
@@ -765,9 +750,6 @@ assert len(math) == 18
 
     def make_main_etc(self):
         self.make_file("main.py", """\
-            # Licensed under the Apache License: http://www.apache.org/licenses/LICENSE-2.0
-            # For details: https://github.com/nedbat/coveragepy/blob/master/NOTICE.txt
-
             import m1
             import m2
             import m3
@@ -780,23 +762,14 @@ assert len(math) == 18
             assert m3.m3a == 1
             """)
         self.make_file("m1.py", """\
-            # Licensed under the Apache License: http://www.apache.org/licenses/LICENSE-2.0
-            # For details: https://github.com/nedbat/coveragepy/blob/master/NOTICE.txt
-
             m1a = 1
             m1b = 2
             """)
         self.make_file("m2.py", """\
-            # Licensed under the Apache License: http://www.apache.org/licenses/LICENSE-2.0
-            # For details: https://github.com/nedbat/coveragepy/blob/master/NOTICE.txt
-
             m2a = 1
             m2b = 2
             """)
         self.make_file("m3.py", """\
-            # Licensed under the Apache License: http://www.apache.org/licenses/LICENSE-2.0
-            # For details: https://github.com/nedbat/coveragepy/blob/master/NOTICE.txt
-
             m3a = 1
             m3b = 2
             """)
@@ -872,11 +845,6 @@ assert len(math) == 18
 
     def test_other(self):
         self.make_file("src/here.py", """\
-            # Licensed under the Apache License: http://www.apache.org/licenses/LICENSE-2.0
-            # For details: https://github.com/nedbat/coveragepy/blob/master/NOTICE.txt
-
-            # A test file for HTML reporting by coverage.py.
-
             import other
 
             if 1 < 2:
@@ -885,9 +853,6 @@ assert len(math) == 18
                 h = 4
             """)
         self.make_file("othersrc/other.py", """\
-            # Licensed under the Apache License: http://www.apache.org/licenses/LICENSE-2.0
-            # For details: https://github.com/nedbat/coveragepy/blob/master/NOTICE.txt
-
             # A file in another directory.  We're checking that it ends up in the
             # HTML report.
 
@@ -916,11 +881,7 @@ assert len(math) == 18
 
     def test_partial(self):
         self.make_file("partial.py", """\
-            # Licensed under the Apache License: http://www.apache.org/licenses/LICENSE-2.0
-            # For details: https://github.com/nedbat/coveragepy/blob/master/NOTICE.txt
-
             # partial branches and excluded lines
-
             a = 6
 
             while True:
@@ -942,9 +903,6 @@ assert len(math) == 18
                 raise AssertionError("Can't")
             """)
         self.make_file("partial.ini", """\
-            # Licensed under the Apache License: http://www.apache.org/licenses/LICENSE-2.0
-            # For details: https://github.com/nedbat/coveragepy/blob/master/NOTICE.txt
-
             [run]
             branch = True
 
@@ -962,13 +920,13 @@ assert len(math) == 18
         compare_html("out", gold_path("html/gold_partial"))
         contains(
             "out/partial_py.html",
-            '<p id="t8" class="stm run hide_run">',
-            '<p id="t11" class="stm run hide_run">',
-            '<p id="t14" class="stm run hide_run">',
+            '<p id="t4" class="stm run hide_run">',
+            '<p id="t7" class="stm run hide_run">',
+            '<p id="t10" class="stm run hide_run">',
             # The "if 0" and "if 1" statements are optimized away.
-            '<p id="t17" class="pln">',
+            '<p id="t13" class="pln">',
             # The "raise AssertionError" is excluded by regex in the .ini.
-            '<p id="t24" class="exc">',
+            '<p id="t20" class="exc">',
         )
         contains(
             "out/index.html",
@@ -981,11 +939,6 @@ assert len(math) == 18
 
     def test_styled(self):
         self.make_file("a.py", """\
-            # Licensed under the Apache License: http://www.apache.org/licenses/LICENSE-2.0
-            # For details: https://github.com/nedbat/coveragepy/blob/master/NOTICE.txt
-
-            # A test file for HTML reporting by coverage.py.
-
             if 1 < 2:
                 # Needed a < to look at HTML entities.
                 a = 3
@@ -1058,9 +1011,6 @@ assert len(math) == 18
     def test_unicode(self):
         self.make_file("unicode.py", """\
             # -*- coding: utf-8 -*-
-            # Licensed under the Apache License: http://www.apache.org/licenses/LICENSE-2.0
-            # For details: https://github.com/nedbat/coveragepy/blob/master/NOTICE.txt
-
             # A Python source file with exotic characters.
 
             upside_down = "ʎd˙ǝbɐɹǝʌoɔ"
author	Ned Batchelder <ned@nedbatchelder.com>	2018-08-22 12:01:34 -0400
committer	Ned Batchelder <ned@nedbatchelder.com>	2018-08-24 06:54:17 -0400
commit	c7e2de351f449132aac34228a9619b8f65360e0f (patch)
tree	09fd1c655d8308486a6aff32f01977a728a4f593
parent	391bd5d5fec0943bb4dbe2862308c229d4cdf84c (diff)
download	python-coveragepy-git-c7e2de351f449132aac34228a9619b8f65360e0f.tar.gz