<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">

<html lang="en">

<head>

<meta content="text/html; charset=utf-8" http-equiv="Content-Type">

<title>

GitLab

</title>

</head>

<body>

<style type="text/css">

img {

max-width: 100%; height: auto;

}

</style>

<div class="content">

<h3>

deamoneye pushed to branch master

at <a href="https://gitlab.com/NTPsec/ntpsec">NTPsec / ntpsec</a>

</h3>

<h4>

Commits:

</h4>

<ul>

<li>

<strong><a href="https://gitlab.com/NTPsec/ntpsec/commit/45693051ea816249605303b94dddd7ffd4f27d15">45693051</a></strong>

<div>

<span>by Keane Wolter</span>

<i>at 2017-01-20T17:53:16-05:00</i>

</div>

<pre class="commit-message" style="margin: 0; white-space: pre-wrap">Added argparse and fixed logging so it will write to STDOUT by default and to the log specified with -l option

</pre>

</li>

</ul>

<h4>1 changed file:</h4>

<ul>

<li class="file-stats">

<a href="#73b38346b096d0f0e53cc19a366d2be16b9f31cb">

contrib/temp-log.py

</a>

</li>

</ul>

<h4>Changes:</h4>

<li id="73b38346b096d0f0e53cc19a366d2be16b9f31cb">

<a href="https://gitlab.com/NTPsec/ntpsec/commit/45693051ea816249605303b94dddd7ffd4f27d15#73b38346b096d0f0e53cc19a366d2be16b9f31cb"><strong>contrib/temp-log.py</strong></a>

<hr>

<table class="code white" style="-premailer-cellpadding: 0; -premailer-cellspacing: 0; -premailer-width: 100%; background: #fff; font-family: monospace; font-size: 12px" bgcolor="#fff" width="100%" cellpadding="0" cellspacing="0">

<tr class="line_holder match" style="line-height: 1.6">

<td class="diff-line-num unfold js-unfold old_line" data-linenumber="2" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">...</td>

<td class="diff-line-num unfold js-unfold new_line" data-linenumber="2" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">...</td>

<td class="line_content match " style="background: #fafafa; color: rgba(0,0,0,0.3); padding-left: 0.5em; padding-right: 0.5em" bgcolor="#fafafa">@@ -2,10 +2,11 @@</td>

</tr>

<tr class="line_holder" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="2" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

2

</td>

<td class="diff-line-num new_line" data-linenumber="2" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

2

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC2" class="line"><span class="c" style="color: #998; font-style: italic"># temp-log.py: A script that will be run eventually as a daemon</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="3" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

3

</td>

<td class="diff-line-num new_line" data-linenumber="3" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

3

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC3" class="line"><span class="c" style="color: #998; font-style: italic">#              to log temperature of a system</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="4" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

4

</td>

<td class="diff-line-num new_line" data-linenumber="4" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

4

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC4" class="line"><span class="c" style="color: #998; font-style: italic"># Usage:</span></span>

</pre>

</td>

</tr>

<tr class="line_holder old" style="line-height: 1.6">

<td class="diff-line-num old old_line" data-linenumber="5" style="background: #f9d7dc; border-right-color: #fac5cd; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#f9d7dc">

5

</td>

<td class="diff-line-num new_line old" data-linenumber="5" style="background: #f9d7dc; border-right-color: #fac5cd; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#f9d7dc">

</td>

<td class="line_content noteable_line old" style="background: #fbe9eb; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#fbe9eb">

<pre style="margin: 0">-<span id="LC5" class="line"><span class="c" style="color: #998; font-style: italic"># temp-log.py [-h] [-V] [-<span class="idiff left right">s] [-m</span>]</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="6" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="5" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

5

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC5" class="line"><span class="c" style="color: #998; font-style: italic"># temp-log.py [-h] [-V] [-<span class="idiff left right">l</span>]</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="6" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

6

</td>

<td class="diff-line-num new_line" data-linenumber="6" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

6

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC6" class="line"><span class="c" style="color: #998; font-style: italic"># Writes logs to /var/log/ntpstats</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="7" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

7

</td>

<td class="diff-line-num new_line" data-linenumber="7" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

7

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC7" class="line"><span class="c" style="color: #998; font-style: italic"># Requires root to run</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="8" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

8

</td>

<td class="diff-line-num new_line" data-linenumber="8" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

8

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC8" class="line"></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="9" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="9" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

9

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC9" class="line"><span class="o" style="font-weight: bold"><<<<<<<</span> <span class="n" style="color: #333">Updated</span> <span class="n" style="color: #333">upstream</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="9" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

9

</td>

<td class="diff-line-num new_line" data-linenumber="10" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

10

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC10" class="line"><span class="kn" style="font-weight: bold">import</span> <span class="nn" style="color: #555">logging</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="10" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

10

</td>

<td class="diff-line-num new_line" data-linenumber="11" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

11

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC11" class="line"><span class="kn" style="font-weight: bold">import</span> <span class="nn" style="color: #555">logging.handlers</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="11" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

11

</td>

<td class="diff-line-num new_line" data-linenumber="12" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

12

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC12" class="line"><span class="kn" style="font-weight: bold">import</span> <span class="nn" style="color: #555">os</span></span>

</pre>

</td>

</tr>

<tr class="line_holder match" style="line-height: 1.6">

<td class="diff-line-num unfold js-unfold old_line" data-linenumber="14" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">...</td>

<td class="diff-line-num unfold js-unfold new_line" data-linenumber="15" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">...</td>

<td class="line_content match " style="background: #fafafa; color: rgba(0,0,0,0.3); padding-left: 0.5em; padding-right: 0.5em" bgcolor="#fafafa">@@ -14,6 +15,12 @@ import subprocess</td>

</tr>

<tr class="line_holder" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="14" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

14

</td>

<td class="diff-line-num new_line" data-linenumber="15" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

15

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC15" class="line"><span class="kn" style="font-weight: bold">import</span> <span class="nn" style="color: #555">sys</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="15" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

15

</td>

<td class="diff-line-num new_line" data-linenumber="16" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

16

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC16" class="line"><span class="kn" style="font-weight: bold">import</span> <span class="nn" style="color: #555">time</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="16" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

16

</td>

<td class="diff-line-num new_line" data-linenumber="17" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

17

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC17" class="line"></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="17" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="18" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

18

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC18" class="line"><span class="o" style="font-weight: bold">=======</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="17" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="19" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

19

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC19" class="line"><span class="kn" style="font-weight: bold">import</span> <span class="nn" style="color: #555">sys</span><span class="p">,</span> <span class="n" style="color: #333">re</span><span class="p">,</span> <span class="n" style="color: #333">time</span><span class="p">,</span> <span class="n" style="color: #333">subprocess</span><span class="p">,</span> <span class="n" style="color: #333">os</span><span class="p">,</span> <span class="n" style="color: #333">logging</span><span class="p">,</span> <span class="n" style="color: #333">logging</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">handlers</span><span class="p">,</span> <span class="n" style="color: #333">argparse</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="17" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="20" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

20

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC20" class="line"></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="17" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="21" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

21

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC21" class="line"><span class="c" style="color: #998; font-style: italic"># Global vars</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="17" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="22" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

22

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC22" class="line"><span class="n" style="color: #333">version</span> <span class="o" style="font-weight: bold">=</span> <span class="mf" style="color: #099">1.0</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="17" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="23" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

23

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC23" class="line"><span class="o" style="font-weight: bold">>>>>>>></span> <span class="n" style="color: #333">Stashed</span> <span class="n" style="color: #333">changes</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="17" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

17

</td>

<td class="diff-line-num new_line" data-linenumber="24" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

24

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC24" class="line"></span>

</pre>

</td>

</tr>

<tr class="line_holder" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="18" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

18

</td>

<td class="diff-line-num new_line" data-linenumber="25" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

25

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC25" class="line"><span class="k" style="font-weight: bold">class</span> <span class="nc" style="color: #458; font-weight: bold">CpuTemp</span><span class="p">:</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="19" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

19

</td>

<td class="diff-line-num new_line" data-linenumber="26" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

26

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC26" class="line">    <span class="s" style="color: #d14">"Sensors on the CPU Core"</span></span>

</pre>

</td>

</tr>

<tr class="line_holder match" style="line-height: 1.6">

<td class="diff-line-num unfold js-unfold old_line" data-linenumber="30" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">...</td>

<td class="diff-line-num unfold js-unfold new_line" data-linenumber="37" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">...</td>

<td class="line_content match " style="background: #fafafa; color: rgba(0,0,0,0.3); padding-left: 0.5em; padding-right: 0.5em" bgcolor="#fafafa">@@ -30,18 +37,19 @@ class CpuTemp:</td>

</tr>

<tr class="line_holder" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="30" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

30

</td>

<td class="diff-line-num new_line" data-linenumber="37" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

37

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC37" class="line">        <span class="s" style="color: #d14">"Collects the data and return the output as an array"</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="31" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

31

</td>

<td class="diff-line-num new_line" data-linenumber="38" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

38

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC38" class="line">        <span class="n" style="color: #333">_index</span> <span class="o" style="font-weight: bold">=</span> <span class="mi" style="color: #099">0</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="32" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

32

</td>

<td class="diff-line-num new_line" data-linenumber="39" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

39

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC39" class="line">        <span class="n" style="color: #333">_data</span> <span class="o" style="font-weight: bold">=</span> <span class="p">[]</span></span>

</pre>

</td>

</tr>

<tr class="line_holder old" style="line-height: 1.6">

<td class="diff-line-num old old_line" data-linenumber="33" style="background: #f9d7dc; border-right-color: #fac5cd; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#f9d7dc">

33

</td>

<td class="diff-line-num new_line old" data-linenumber="40" style="background: #f9d7dc; border-right-color: #fac5cd; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#f9d7dc">

</td>

<td class="line_content noteable_line old" style="background: #fbe9eb; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#fbe9eb">

<pre style="margin: 0">-<span id="LC33" class="line">        <span class="bp" style="color: #999"><span class="idiff left">self</span></span><span class="o" style="font-weight: bold"><span class="idiff">.</span></span><span class="n" style="color: #333"><span class="idiff">_record_temp</span></span><span class="p"><span class="idiff right">()</span></span></span>

</pre>

</td>

</tr>

<tr class="line_holder old" style="line-height: 1.6">

<td class="diff-line-num old old_line" data-linenumber="34" style="background: #f9d7dc; border-right-color: #fac5cd; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#f9d7dc">

34

</td>

<td class="diff-line-num new_line old" data-linenumber="40" style="background: #f9d7dc; border-right-color: #fac5cd; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#f9d7dc">

</td>

<td class="line_content noteable_line old" style="background: #fbe9eb; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#fbe9eb">

<pre style="margin: 0">-<span id="LC34" class="line">        <span class="c" style="color: #998; font-style: italic"><span class="idiff left right"># grab the needed output and format it to log</span></span></span>

</pre>

</td>

</tr>

<tr class="line_holder old" style="line-height: 1.6">

<td class="diff-line-num old old_line" data-linenumber="35" style="background: #f9d7dc; border-right-color: #fac5cd; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#f9d7dc">

35

</td>

<td class="diff-line-num new_line old" data-linenumber="40" style="background: #f9d7dc; border-right-color: #fac5cd; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#f9d7dc">

</td>

<td class="line_content noteable_line old" style="background: #fbe9eb; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#fbe9eb">

<pre style="margin: 0">-<span id="LC35" class="line">        <span class="k" style="font-weight: bold">for</span> <span class="n" style="color: #333">record</span> <span class="ow" style="font-weight: bold">in</span> <span class="bp" style="color: #999"><span class="idiff left">self</span></span><span class="o" style="font-weight: bold"><span class="idiff">.</span></span><span class="n" style="color: #333"><span class="idiff right">sensors</span>_output</span><span class="p">:</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="36" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="40" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

40

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC40" class="line">        <span class="c" style="color: #998; font-style: italic"><span class="idiff left right"># grab the needed output</span></span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="36" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="41" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

41

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC41" class="line">        <span class="n" style="color: #333"><span class="idiff left">_output</span></span><span class="idiff"> </span><span class="o" style="font-weight: bold"><span class="idiff">=</span></span><span class="idiff"> </span><span class="n" style="color: #333"><span class="idiff">subprocess</span></span><span class="o" style="font-weight: bold"><span class="idiff">.</span></span><span class="n" style="color: #333"><span class="idiff">check_output</span></span><span class="p"><span class="idiff">([</span></span><span class="bp" style="color: #999"><span class="idiff">self</span></span><span class="o" style="font-weight: bold"><span class="idiff">.</span></span><span class="n" style="color: #333"><span class="idiff">_sensors_path</span></span><span class="p"><span class="idiff">,</span></span><span class="idiff"> </span><span class="s" style="color: #d14"><span class="idiff">"-u"</span></span><span class="p"><span class="idiff">],</span></span><span class="idiff"> </span><span class="n" style="color: #333"><span class="idiff">universal_newlines</span></span><span class="o" style="font-weight: bold"><span class="idiff">=</span></span><span class="bp" style="color: #999"><span class="idiff">True</span></span><span class="p"><span class="idiff">)</span></span><span class="o" style="font-weight: bold"><span class="idiff">.</span></span><span class="n" style="color: #333"><span class="idiff">split</span></span><span class="p"><span class="idiff">(</span></span><span class="s" style="color: #d14"><span class="idiff">'</span></span><span class="se" style="color: #d14"><span class="idiff">\n</span></span><span class="s" style="color: #d14"><span class="idiff">'</span></span><span class="p"><span class="idiff right">)</span></span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="36" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="42" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

42

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC42" class="line">        <span class="k" style="font-weight: bold">for</span> <span class="n" style="color: #333">record</span> <span class="ow" style="font-weight: bold">in</span> <span class="n" style="color: #333">_output</span><span class="p">:</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="36" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

36

</td>

<td class="diff-line-num new_line" data-linenumber="43" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

43

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC43" class="line">            <span class="n" style="color: #333">match</span> <span class="o" style="font-weight: bold">=</span> <span class="bp" style="color: #999">self</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">_pattern</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">match</span><span class="p">(</span><span class="n" style="color: #333">record</span><span class="p">)</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="37" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

37

</td>

<td class="diff-line-num new_line" data-linenumber="44" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

44

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC44" class="line">            <span class="k" style="font-weight: bold">if</span> <span class="n" style="color: #333">match</span> <span class="ow" style="font-weight: bold">and</span> <span class="n" style="color: #333">match</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">group</span><span class="p">(</span><span class="mi" style="color: #099">1</span><span class="p">):</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="38" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

38

</td>

<td class="diff-line-num new_line" data-linenumber="45" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

45

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC45" class="line">                <span class="n" style="color: #333">_now</span> <span class="o" style="font-weight: bold">=</span> <span class="nb" style="color: #0086b3">int</span><span class="p">(</span><span class="n" style="color: #333">time</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">time</span><span class="p">())</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="39" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

39

</td>

<td class="diff-line-num new_line" data-linenumber="46" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

46

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC46" class="line">                <span class="n" style="color: #333">_cpu_temprature</span> <span class="o" style="font-weight: bold">=</span> <span class="n" style="color: #333">match</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">group</span><span class="p">(</span><span class="mi" style="color: #099">1</span><span class="p">)</span></span>

</pre>

</td>

</tr>

<tr class="line_holder old" style="line-height: 1.6">

<td class="diff-line-num old old_line" data-linenumber="40" style="background: #f9d7dc; border-right-color: #fac5cd; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#f9d7dc">

40

</td>

<td class="diff-line-num new_line old" data-linenumber="47" style="background: #f9d7dc; border-right-color: #fac5cd; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#f9d7dc">

</td>

<td class="line_content noteable_line old" style="background: #fbe9eb; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#fbe9eb">

<pre style="margin: 0">-<span id="LC40" class="line">                <span class="n" style="color: #333">_data</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">append</span><span class="p">(</span><span class="s" style="color: #d14">'{}<span class="idiff left right"> {} </span>{}'</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">format</span><span class="p">(</span><span class="n" style="color: #333">_now</span><span class="p">,</span> <span class="n" style="color: #333">_index</span><span class="p">,</span> <span class="n" style="color: #333">_cpu_temprature</span><span class="p">))</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="41" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="47" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

47

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC47" class="line">                <span class="n" style="color: #333">_data</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">append</span><span class="p">(</span><span class="s" style="color: #d14">'{}<span class="idiff left right">,{},</span>{}'</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">format</span><span class="p">(</span><span class="n" style="color: #333">_now</span><span class="p">,</span> <span class="n" style="color: #333">_index</span><span class="p">,</span> <span class="n" style="color: #333">_cpu_temprature</span><span class="p">))</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="41" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

41

</td>

<td class="diff-line-num new_line" data-linenumber="48" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

48

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC48" class="line">                <span class="n" style="color: #333">_index</span> <span class="o" style="font-weight: bold">+=</span> <span class="mi" style="color: #099">1</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="42" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

42

</td>

<td class="diff-line-num new_line" data-linenumber="49" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

49

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC49" class="line"></span>

</pre>

</td>

</tr>

<tr class="line_holder" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="43" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

43

</td>

<td class="diff-line-num new_line" data-linenumber="50" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

50

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC50" class="line">        <span class="k" style="font-weight: bold">return</span> <span class="n" style="color: #333">_data</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="44" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

44

</td>

<td class="diff-line-num new_line" data-linenumber="51" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

51

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC51" class="line"></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="45" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="52" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

52

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC52" class="line"><span class="o" style="font-weight: bold"><<<<<<<</span> <span class="n" style="color: #333">Updated</span> <span class="n" style="color: #333">upstream</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="45" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

45

</td>

<td class="diff-line-num new_line" data-linenumber="53" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

53

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC53" class="line">    <span class="k" style="font-weight: bold">def</span> <span class="nf" style="color: #900; font-weight: bold">_record_temp</span><span class="p">(</span><span class="bp" style="color: #999">self</span><span class="p">):</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="46" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

46

</td>

<td class="diff-line-num new_line" data-linenumber="54" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

54

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC54" class="line">        <span class="s" style="color: #d14">"Call the external command 'sensors -u' and get the data"</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="47" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

47

</td>

<td class="diff-line-num new_line" data-linenumber="55" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

55

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC55" class="line">        <span class="c" style="color: #998; font-style: italic"># grab the data from the "sensors -u" command</span></span>

</pre>

</td>

</tr>

<tr class="line_holder match" style="line-height: 1.6">

<td class="diff-line-num unfold js-unfold old_line" data-linenumber="50" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">...</td>

<td class="diff-line-num unfold js-unfold new_line" data-linenumber="58" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">...</td>

<td class="line_content match " style="background: #fafafa; color: rgba(0,0,0,0.3); padding-left: 0.5em; padding-right: 0.5em" bgcolor="#fafafa">@@ -50,18 +58,24 @@ class CpuTemp:</td>

</tr>

<tr class="line_holder" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="50" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

50

</td>

<td class="diff-line-num new_line" data-linenumber="58" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

58

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC58" class="line">        <span class="bp" style="color: #999">self</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">sensors_output</span> <span class="o" style="font-weight: bold">=</span> <span class="n" style="color: #333">output</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">split</span><span class="p">(</span><span class="s" style="color: #d14">'</span><span class="se" style="color: #d14">\n</span><span class="s" style="color: #d14">'</span><span class="p">)</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="51" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

51

</td>

<td class="diff-line-num new_line" data-linenumber="59" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

59

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC59" class="line"></span>

</pre>

</td>

</tr>

<tr class="line_holder" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="52" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

52

</td>

<td class="diff-line-num new_line" data-linenumber="60" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

60

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC60" class="line"></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="53" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="61" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

61

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC61" class="line"><span class="o" style="font-weight: bold">=======</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="53" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="62" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

62

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC62" class="line"><span class="o" style="font-weight: bold">>>>>>>></span> <span class="n" style="color: #333">Stashed</span> <span class="n" style="color: #333">changes</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="53" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

53

</td>

<td class="diff-line-num new_line" data-linenumber="63" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

63

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC63" class="line"><span class="k" style="font-weight: bold">class</span> <span class="nc" style="color: #458; font-weight: bold">SmartCtl</span><span class="p">:</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="54" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

54

</td>

<td class="diff-line-num new_line" data-linenumber="64" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

64

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC64" class="line">    <span class="s" style="color: #d14">"Sensor on the Hard Drive"</span></span>

</pre>

</td>

</tr>

<tr class="line_holder old" style="line-height: 1.6">

<td class="diff-line-num old old_line" data-linenumber="55" style="background: #f9d7dc; border-right-color: #fac5cd; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#f9d7dc">

55

</td>

<td class="diff-line-num new_line old" data-linenumber="65" style="background: #f9d7dc; border-right-color: #fac5cd; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#f9d7dc">

</td>

<td class="line_content noteable_line old" style="background: #fbe9eb; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#fbe9eb">

<pre style="margin: 0">-<span id="LC55" class="line">    <span class="k" style="font-weight: bold">def</span> <span class="nf" style="color: #900; font-weight: bold">__init__</span><span class="p">(</span><span class="bp" style="color: #999">self</span><span class="p"><span class="idiff left">,</span></span><span class="idiff"> </span><span class="n" style="color: #333"><span class="idiff right">device</span></span><span class="p">):</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="56" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="65" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

65

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC65" class="line">    <span class="k" style="font-weight: bold">def</span> <span class="nf" style="color: #900; font-weight: bold">__init__</span><span class="p">(</span><span class="bp" style="color: #999">self</span><span class="p">):</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="56" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

56

</td>

<td class="diff-line-num new_line" data-linenumber="66" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

66

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC66" class="line">        <span class="k" style="font-weight: bold">if</span> <span class="n" style="color: #333">os</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">getuid</span><span class="p">()</span> <span class="o" style="font-weight: bold">!=</span> <span class="mi" style="color: #099">0</span><span class="p">:</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="57" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

57

</td>

<td class="diff-line-num new_line" data-linenumber="67" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

67

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC67" class="line">            <span class="k" style="font-weight: bold">raise</span> <span class="nb" style="color: #0086b3">IOError</span><span class="p">(</span><span class="s" style="color: #d14">"You must be root!"</span><span class="p">)</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="58" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

58

</td>

<td class="diff-line-num new_line" data-linenumber="68" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

68

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC68" class="line">        <span class="c" style="color: #998; font-style: italic"># Which drive to watch</span></span>

</pre>

</td>

</tr>

<tr class="line_holder old" style="line-height: 1.6">

<td class="diff-line-num old old_line" data-linenumber="59" style="background: #f9d7dc; border-right-color: #fac5cd; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#f9d7dc">

59

</td>

<td class="diff-line-num new_line old" data-linenumber="69" style="background: #f9d7dc; border-right-color: #fac5cd; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#f9d7dc">

</td>

<td class="line_content noteable_line old" style="background: #fbe9eb; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#fbe9eb">

<pre style="margin: 0">-<span id="LC59" class="line">        <span class="bp" style="color: #999">self</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">_device</span> <span class="o" style="font-weight: bold">=</span> <span class="n" style="color: #333">device</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="60" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="69" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

69

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC69" class="line">        <span class="bp" style="color: #999">self</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">_drives</span> <span class="o" style="font-weight: bold">=</span> <span class="p">[]</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="60" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="70" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

70

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC70" class="line">        <span class="k" style="font-weight: bold">for</span> <span class="n" style="color: #333">child</span> <span class="ow" style="font-weight: bold">in</span> <span class="n" style="color: #333">os</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">listdir</span><span class="p">(</span><span class="s" style="color: #d14">'/dev/'</span><span class="p">):</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="60" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="71" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

71

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC71" class="line">            <span class="k" style="font-weight: bold">if</span> <span class="n" style="color: #333">re</span><span class="o" style="font-weight: bold">.</span><span class="nb" style="color: #0086b3">compile</span><span class="p">(</span><span class="s" style="color: #d14">'sd[a-z]$'</span><span class="p">)</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">match</span><span class="p">(</span><span class="n" style="color: #333">child</span><span class="p">):</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="60" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="72" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

72

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC72" class="line">                <span class="bp" style="color: #999">self</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">_drives</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">append</span><span class="p">(</span><span class="s" style="color: #d14">"/dev/"</span><span class="o" style="font-weight: bold">+</span><span class="nb" style="color: #0086b3">str</span><span class="p">(</span><span class="n" style="color: #333">child</span><span class="p">))</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="60" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

60

</td>

<td class="diff-line-num new_line" data-linenumber="73" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

73

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC73" class="line">        <span class="c" style="color: #998; font-style: italic"># this regex matches temperature output lines from smartctl -a</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="61" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

61

</td>

<td class="diff-line-num new_line" data-linenumber="74" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

74

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC74" class="line">        <span class="bp" style="color: #999">self</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">_pat</span> <span class="o" style="font-weight: bold">=</span> <span class="n" style="color: #333">re</span><span class="o" style="font-weight: bold">.</span><span class="nb" style="color: #0086b3">compile</span><span class="p">(</span><span class="s" style="color: #d14">'194 Temperature_Celsius</span><span class="err" style="background: #e3d2d2; color: #a61717">\</span><span class="s" style="color: #d14">s+</span><span class="err" style="background: #e3d2d2; color: #a61717">\</span><span class="s" style="color: #d14">S+</span><span class="err" style="background: #e3d2d2; color: #a61717">\</span><span class="s" style="color: #d14">s+(</span><span class="err" style="background: #e3d2d2; color: #a61717">\</span><span class="s" style="color: #d14">d+)</span><span class="err" style="background: #e3d2d2; color: #a61717">\</span><span class="s" style="color: #d14">s+'</span><span class="p">)</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="62" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

62

</td>

<td class="diff-line-num new_line" data-linenumber="75" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

75

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC75" class="line"></span>

</pre>

</td>

</tr>

<tr class="line_holder" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="63" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

63

</td>

<td class="diff-line-num new_line" data-linenumber="76" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

76

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC76" class="line">    <span class="k" style="font-weight: bold">def</span> <span class="nf" style="color: #900; font-weight: bold">get_data</span><span class="p">(</span><span class="bp" style="color: #999">self</span><span class="p">):</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="64" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

64

</td>

<td class="diff-line-num new_line" data-linenumber="77" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

77

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC77" class="line">        <span class="s" style="color: #d14">"Collects the data and return the output as an array"</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="65" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="78" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

78

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC78" class="line"><span class="o" style="font-weight: bold"><<<<<<<</span> <span class="n" style="color: #333">Updated</span> <span class="n" style="color: #333">upstream</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="65" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

65

</td>

<td class="diff-line-num new_line" data-linenumber="79" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

79

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC79" class="line">        <span class="n" style="color: #333">_output</span> <span class="o" style="font-weight: bold">=</span> <span class="n" style="color: #333">subprocess</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">check_output</span><span class="p">([</span><span class="s" style="color: #d14">"smartctl"</span><span class="p">,</span> <span class="s" style="color: #d14">"-a"</span><span class="p">,</span> <span class="bp" style="color: #999">self</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">_device</span><span class="p">],</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="66" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

66

</td>

<td class="diff-line-num new_line" data-linenumber="80" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

80

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC80" class="line">                                          <span class="n" style="color: #333">universal_newlines</span><span class="o" style="font-weight: bold">=</span><span class="bp" style="color: #999">True</span><span class="p">)</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="67" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

67

</td>

<td class="diff-line-num new_line" data-linenumber="81" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

81

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC81" class="line">        <span class="n" style="color: #333">_lines</span> <span class="o" style="font-weight: bold">=</span> <span class="n" style="color: #333">_output</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">split</span><span class="p">(</span><span class="s" style="color: #d14">'</span><span class="se" style="color: #d14">\n</span><span class="s" style="color: #d14">'</span><span class="p">)</span></span>

</pre>

</td>

</tr>

<tr class="line_holder match" style="line-height: 1.6">

<td class="diff-line-num unfold js-unfold old_line" data-linenumber="71" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">...</td>

<td class="diff-line-num unfold js-unfold new_line" data-linenumber="85" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">...</td>

<td class="line_content match " style="background: #fafafa; color: rgba(0,0,0,0.3); padding-left: 0.5em; padding-right: 0.5em" bgcolor="#fafafa">@@ -71,6 +85,16 @@ class SmartCtl:</td>

</tr>

<tr class="line_holder" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="71" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

71

</td>

<td class="diff-line-num new_line" data-linenumber="85" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

85

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC85" class="line">            <span class="k" style="font-weight: bold">if</span> <span class="n" style="color: #333">match</span> <span class="ow" style="font-weight: bold">and</span> <span class="n" style="color: #333">match</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">group</span><span class="p">(</span><span class="mi" style="color: #099">1</span><span class="p">):</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="72" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

72

</td>

<td class="diff-line-num new_line" data-linenumber="86" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

86

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC86" class="line">                <span class="n" style="color: #333">temp</span> <span class="o" style="font-weight: bold">=</span> <span class="n" style="color: #333">match</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">group</span><span class="p">(</span><span class="mi" style="color: #099">1</span><span class="p">)</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="73" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

73

</td>

<td class="diff-line-num new_line" data-linenumber="87" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

87

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC87" class="line">                <span class="k" style="font-weight: bold">return</span> <span class="p">(</span><span class="s" style="color: #d14">'</span><span class="si" style="color: #d14">%</span><span class="s" style="color: #d14">d SMART </span><span class="si" style="color: #d14">%</span><span class="s" style="color: #d14">s'</span> <span class="o" style="font-weight: bold">%</span> <span class="p">(</span><span class="n" style="color: #333">now</span><span class="p">,</span> <span class="n" style="color: #333">temp</span><span class="p">))</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="74" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="88" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

88

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC88" class="line"><span class="o" style="font-weight: bold">=======</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="74" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="89" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

89

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC89" class="line">        <span class="k" style="font-weight: bold">for</span> <span class="n" style="color: #333">_device</span> <span class="ow" style="font-weight: bold">in</span> <span class="bp" style="color: #999">self</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">_drives</span><span class="p">:</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="74" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="90" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

90

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC90" class="line">            <span class="n" style="color: #333">_output</span> <span class="o" style="font-weight: bold">=</span> <span class="n" style="color: #333">subprocess</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">check_output</span><span class="p">([</span><span class="s" style="color: #d14">"smartctl"</span><span class="p">,</span> <span class="s" style="color: #d14">"-a"</span><span class="p">,</span> <span class="n" style="color: #333">_device</span><span class="p">],</span> <span class="n" style="color: #333">universal_newlines</span><span class="o" style="font-weight: bold">=</span><span class="bp" style="color: #999">True</span><span class="p">)</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">split</span><span class="p">(</span><span class="s" style="color: #d14">'</span><span class="se" style="color: #d14">\n</span><span class="s" style="color: #d14">'</span><span class="p">)</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="74" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="91" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

91

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC91" class="line">            <span class="k" style="font-weight: bold">for</span> <span class="n" style="color: #333">line</span> <span class="ow" style="font-weight: bold">in</span> <span class="n" style="color: #333">_output</span><span class="p">:</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="74" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="92" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

92

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC92" class="line">                <span class="n" style="color: #333">match</span> <span class="o" style="font-weight: bold">=</span> <span class="bp" style="color: #999">self</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">_pat</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">match</span><span class="p">(</span><span class="n" style="color: #333">line</span><span class="p">)</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="74" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="93" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

93

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC93" class="line">                <span class="n" style="color: #333">now</span> <span class="o" style="font-weight: bold">=</span> <span class="nb" style="color: #0086b3">int</span><span class="p">(</span><span class="n" style="color: #333">time</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">time</span><span class="p">())</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="74" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="94" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

94

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC94" class="line">                <span class="k" style="font-weight: bold">if</span> <span class="n" style="color: #333">match</span> <span class="ow" style="font-weight: bold">and</span> <span class="n" style="color: #333">match</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">group</span><span class="p">(</span><span class="mi" style="color: #099">1</span><span class="p">):</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="74" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="95" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

95

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC95" class="line">                    <span class="n" style="color: #333">temp</span> <span class="o" style="font-weight: bold">=</span> <span class="n" style="color: #333">match</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">group</span><span class="p">(</span><span class="mi" style="color: #099">1</span><span class="p">)</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="74" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="96" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

96

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC96" class="line">                    <span class="k" style="font-weight: bold">return</span> <span class="p">(</span><span class="s" style="color: #d14">'</span><span class="si" style="color: #d14">%</span><span class="s" style="color: #d14">d,</span><span class="si" style="color: #d14">%</span><span class="s" style="color: #d14">s,</span><span class="si" style="color: #d14">%</span><span class="s" style="color: #d14">s'</span> <span class="o" style="font-weight: bold">%</span> <span class="p">(</span><span class="n" style="color: #333">now</span><span class="p">,</span> <span class="n" style="color: #333">_device</span><span class="p">,</span> <span class="n" style="color: #333">temp</span><span class="p">))</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="74" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="97" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

97

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC97" class="line"><span class="o" style="font-weight: bold">>>>>>>></span> <span class="n" style="color: #333">Stashed</span> <span class="n" style="color: #333">changes</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="74" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

74

</td>

<td class="diff-line-num new_line" data-linenumber="98" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

98

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC98" class="line"></span>

</pre>

</td>

</tr>

<tr class="line_holder" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="75" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

75

</td>

<td class="diff-line-num new_line" data-linenumber="99" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

99

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC99" class="line"></span>

</pre>

</td>

</tr>

<tr class="line_holder" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="76" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

76

</td>

<td class="diff-line-num new_line" data-linenumber="100" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

100

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC100" class="line"><span class="k" style="font-weight: bold">class</span> <span class="nc" style="color: #458; font-weight: bold">ZoneTemp</span><span class="p">:</span></span>

</pre>

</td>

</tr>

<tr class="line_holder match" style="line-height: 1.6">

<td class="diff-line-num unfold js-unfold old_line" data-linenumber="92" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">...</td>

<td class="diff-line-num unfold js-unfold new_line" data-linenumber="116" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">...</td>

<td class="line_content match " style="background: #fafafa; color: rgba(0,0,0,0.3); padding-left: 0.5em; padding-right: 0.5em" bgcolor="#fafafa">@@ -92,11 +116,12 @@ class ZoneTemp:</td>

</tr>

<tr class="line_holder" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="92" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

92

</td>

<td class="diff-line-num new_line" data-linenumber="116" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

116

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC116" class="line">            <span class="k" style="font-weight: bold">for</span> <span class="n" style="color: #333">line</span> <span class="ow" style="font-weight: bold">in</span> <span class="n" style="color: #333">_zone_data</span><span class="p">:</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="93" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

93

</td>

<td class="diff-line-num new_line" data-linenumber="117" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

117

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC117" class="line">                <span class="n" style="color: #333">temp</span> <span class="o" style="font-weight: bold">=</span> <span class="nb" style="color: #0086b3">float</span><span class="p">(</span><span class="n" style="color: #333">line</span><span class="p">)</span> <span class="o" style="font-weight: bold">/</span> <span class="mi" style="color: #099">1000</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="94" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

94

</td>

<td class="diff-line-num new_line" data-linenumber="118" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

118

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC118" class="line">                <span class="n" style="color: #333">_now</span> <span class="o" style="font-weight: bold">=</span> <span class="nb" style="color: #0086b3">int</span><span class="p">(</span><span class="n" style="color: #333">time</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">time</span><span class="p">())</span></span>

</pre>

</td>

</tr>

<tr class="line_holder old" style="line-height: 1.6">

<td class="diff-line-num old old_line" data-linenumber="95" style="background: #f9d7dc; border-right-color: #fac5cd; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#f9d7dc">

95

</td>

<td class="diff-line-num new_line old" data-linenumber="119" style="background: #f9d7dc; border-right-color: #fac5cd; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#f9d7dc">

</td>

<td class="line_content noteable_line old" style="background: #fbe9eb; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#fbe9eb">

<pre style="margin: 0">-<span id="LC95" class="line">                <span class="n" style="color: #333">_data</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">append</span><span class="p">(</span><span class="s" style="color: #d14">'{}<span class="idiff left right"> {} </span>{}'</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">format</span><span class="p">(</span><span class="n" style="color: #333">_now</span><span class="p">,</span> <span class="n" style="color: #333">_zone</span><span class="p">,</span> <span class="n" style="color: #333">temp</span><span class="p">))</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="96" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="119" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

119

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC119" class="line">                <span class="n" style="color: #333">_data</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">append</span><span class="p">(</span><span class="s" style="color: #d14">'{}<span class="idiff left right">,{},</span>{}'</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">format</span><span class="p">(</span><span class="n" style="color: #333">_now</span><span class="p">,</span> <span class="n" style="color: #333">_zone</span><span class="p">,</span> <span class="n" style="color: #333">temp</span><span class="p">))</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="96" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

96

</td>

<td class="diff-line-num new_line" data-linenumber="120" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

120

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC120" class="line">                <span class="n" style="color: #333">_zone</span> <span class="o" style="font-weight: bold">=</span> <span class="n" style="color: #333">_zone</span><span class="o" style="font-weight: bold">+</span><span class="mi" style="color: #099">1</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="97" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

97

</td>

<td class="diff-line-num new_line" data-linenumber="121" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

121

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC121" class="line">            <span class="n" style="color: #333">_zone_data</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">close</span><span class="p">()</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="98" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

98

</td>

<td class="diff-line-num new_line" data-linenumber="122" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

122

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC122" class="line">        <span class="k" style="font-weight: bold">return</span> <span class="n" style="color: #333">_data</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="99" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

99

</td>

<td class="diff-line-num new_line" data-linenumber="123" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

123

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC123" class="line"></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="100" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="124" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

124

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC124" class="line"><span class="o" style="font-weight: bold"><<<<<<<</span> <span class="n" style="color: #333">Updated</span> <span class="n" style="color: #333">upstream</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="100" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

100

</td>

<td class="diff-line-num new_line" data-linenumber="125" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

125

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC125" class="line"><span class="c" style="color: #998; font-style: italic"># Global vars</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="101" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

101

</td>

<td class="diff-line-num new_line" data-linenumber="126" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

126

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC126" class="line"><span class="n" style="color: #333">version</span> <span class="o" style="font-weight: bold">=</span> <span class="mf" style="color: #099">1.0</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="102" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

102

</td>

<td class="diff-line-num new_line" data-linenumber="127" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

127

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC127" class="line"><span class="c" style="color: #998; font-style: italic"># Create objects</span></span>

</pre>

</td>

</tr>

<tr class="line_holder match" style="line-height: 1.6">

<td class="diff-line-num unfold js-unfold old_line" data-linenumber="109" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">...</td>

<td class="diff-line-num unfold js-unfold new_line" data-linenumber="134" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">...</td>

<td class="line_content match " style="background: #fafafa; color: rgba(0,0,0,0.3); padding-left: 0.5em; padding-right: 0.5em" bgcolor="#fafafa">@@ -109,6 +134,11 @@ def logging_setup(fileName, levelName, logLevel):</td>

</tr>

<tr class="line_holder" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="109" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

109

</td>

<td class="diff-line-num new_line" data-linenumber="134" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

134

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC134" class="line">    <span class="s" style="color: #d14">"Create logging object with midnight rotation"</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="110" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

110

</td>

<td class="diff-line-num new_line" data-linenumber="135" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

135

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC135" class="line">    <span class="n" style="color: #333">logFormat</span> <span class="o" style="font-weight: bold">=</span> <span class="n" style="color: #333">logging</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">Formatter</span><span class="p">(</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="111" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

111

</td>

<td class="diff-line-num new_line" data-linenumber="136" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

136

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC136" class="line">        <span class="s" style="color: #d14">'</span><span class="si" style="color: #d14">%(asctime)</span><span class="s" style="color: #d14">s - </span><span class="si" style="color: #d14">%(name)</span><span class="s" style="color: #d14">s - </span><span class="si" style="color: #d14">%(levelname)</span><span class="s" style="color: #d14">s - </span><span class="si" style="color: #d14">%(message)</span><span class="s" style="color: #d14">s'</span><span class="p">)</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="112" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="137" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

137

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC137" class="line"><span class="o" style="font-weight: bold">=======</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="112" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="138" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

138

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC138" class="line"><span class="k" style="font-weight: bold">def</span> <span class="nf" style="color: #900; font-weight: bold">logging_setup</span><span class="p">(</span><span class="n" style="color: #333">fileName</span><span class="p">,</span> <span class="n" style="color: #333">levelName</span><span class="p">,</span> <span class="n" style="color: #333">logLevel</span><span class="p">):</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="112" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="139" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

139

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC139" class="line">    <span class="s" style="color: #d14">"Create logging object"</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="112" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="140" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

140

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC140" class="line">    <span class="n" style="color: #333">logFormat</span> <span class="o" style="font-weight: bold">=</span> <span class="n" style="color: #333">logging</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">Formatter</span><span class="p">(</span><span class="s" style="color: #d14">'</span><span class="si" style="color: #d14">%(asctime)</span><span class="s" style="color: #d14">s,</span><span class="si" style="color: #d14">%(name)</span><span class="s" style="color: #d14">s,</span><span class="si" style="color: #d14">%(levelname)</span><span class="s" style="color: #d14">s,</span><span class="si" style="color: #d14">%(message)</span><span class="s" style="color: #d14">s'</span><span class="p">)</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="112" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="141" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

141

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC141" class="line"><span class="o" style="font-weight: bold">>>>>>>></span> <span class="n" style="color: #333">Stashed</span> <span class="n" style="color: #333">changes</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="112" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

112

</td>

<td class="diff-line-num new_line" data-linenumber="142" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

142

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC142" class="line">    <span class="c" style="color: #998; font-style: italic"># Create logger for cpuTemp</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="113" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

113

</td>

<td class="diff-line-num new_line" data-linenumber="143" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

143

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC143" class="line">    <span class="n" style="color: #333">tempLogger</span> <span class="o" style="font-weight: bold">=</span> <span class="n" style="color: #333">logging</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">getLogger</span><span class="p">(</span><span class="n" style="color: #333">levelName</span><span class="p">)</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="114" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

114

</td>

<td class="diff-line-num new_line" data-linenumber="144" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

144

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC144" class="line">    <span class="n" style="color: #333">tempLogger</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">setLevel</span><span class="p">(</span><span class="n" style="color: #333">logLevel</span><span class="p">)</span></span>

</pre>

</td>

</tr>

<tr class="line_holder match" style="line-height: 1.6">

<td class="diff-line-num unfold js-unfold old_line" data-linenumber="125" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">...</td>

<td class="diff-line-num unfold js-unfold new_line" data-linenumber="155" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">...</td>

<td class="line_content match " style="background: #fafafa; color: rgba(0,0,0,0.3); padding-left: 0.5em; padding-right: 0.5em" bgcolor="#fafafa">@@ -125,18 +155,38 @@ def logging_setup(fileName, levelName, logLevel):</td>

</tr>

<tr class="line_holder" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="125" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

125

</td>

<td class="diff-line-num new_line" data-linenumber="155" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

155

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC155" class="line">    <span class="n" style="color: #333">_file</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">setFormatter</span><span class="p">(</span><span class="n" style="color: #333">logFormat</span><span class="p">)</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="126" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

126

</td>

<td class="diff-line-num new_line" data-linenumber="156" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

156

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC156" class="line">    <span class="c" style="color: #998; font-style: italic"># Add the handler to the logger</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="127" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

127

</td>

<td class="diff-line-num new_line" data-linenumber="157" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

157

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC157" class="line">    <span class="n" style="color: #333">tempLogger</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">addHandler</span><span class="p">(</span><span class="n" style="color: #333">_file</span><span class="p">)</span></span>

</pre>

</td>

</tr>

<tr class="line_holder old" style="line-height: 1.6">

<td class="diff-line-num old old_line" data-linenumber="128" style="background: #f9d7dc; border-right-color: #fac5cd; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#f9d7dc">

128

</td>

<td class="diff-line-num new_line old" data-linenumber="158" style="background: #f9d7dc; border-right-color: #fac5cd; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#f9d7dc">

</td>

<td class="line_content noteable_line old" style="background: #fbe9eb; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#fbe9eb">

<pre style="margin: 0">-<span id="LC128" class="line">    <span class="c" style="color: #998; font-style: italic"># Logging rotate</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="129" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

129

</td>

<td class="diff-line-num new_line" data-linenumber="158" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

158

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC158" class="line">    <span class="k" style="font-weight: bold">return</span> <span class="n" style="color: #333">tempLogger</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="130" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

130

</td>

<td class="diff-line-num new_line" data-linenumber="159" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

159

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC159" class="line"></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="131" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="160" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

160

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC160" class="line"><span class="o" style="font-weight: bold"><<<<<<<</span> <span class="n" style="color: #333">Updated</span> <span class="n" style="color: #333">upstream</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="131" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

131

</td>

<td class="diff-line-num new_line" data-linenumber="161" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

161

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC161" class="line"></span>

</pre>

</td>

</tr>

<tr class="line_holder" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="132" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

132

</td>

<td class="diff-line-num new_line" data-linenumber="162" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

162

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC162" class="line"><span class="k" style="font-weight: bold">def</span> <span class="nf" style="color: #900; font-weight: bold">log_data</span><span class="p">(</span><span class="n" style="color: #333">logger</span><span class="p">,</span> <span class="n" style="color: #333">data</span><span class="p">):</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="133" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

133

</td>

<td class="diff-line-num new_line" data-linenumber="163" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

163

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC163" class="line">    <span class="s" style="color: #d14">"Write data to the log"</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="134" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="164" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

164

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC164" class="line"><span class="o" style="font-weight: bold">=======</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="134" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="165" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

165

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC165" class="line"><span class="k" style="font-weight: bold">def</span> <span class="nf" style="color: #900; font-weight: bold">console_log_setup</span><span class="p">(</span><span class="n" style="color: #333">levelName</span><span class="p">,</span> <span class="n" style="color: #333">logLevel</span><span class="p">):</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="134" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="166" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

166

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC166" class="line">    <span class="s" style="color: #d14">"Create logging object that writes to STDOUT"</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="134" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="167" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

167

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC167" class="line">    <span class="n" style="color: #333">logFormat</span> <span class="o" style="font-weight: bold">=</span> <span class="n" style="color: #333">logging</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">Formatter</span><span class="p">(</span><span class="s" style="color: #d14">'</span><span class="si" style="color: #d14">%(asctime)</span><span class="s" style="color: #d14">s,</span><span class="si" style="color: #d14">%(name)</span><span class="s" style="color: #d14">s,</span><span class="si" style="color: #d14">%(levelname)</span><span class="s" style="color: #d14">s,</span><span class="si" style="color: #d14">%(message)</span><span class="s" style="color: #d14">s'</span><span class="p">)</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="134" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="168" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

168

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC168" class="line">    <span class="c" style="color: #998; font-style: italic"># Create the logging object</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="134" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="169" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

169

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC169" class="line">    <span class="n" style="color: #333">tempLog</span> <span class="o" style="font-weight: bold">=</span> <span class="n" style="color: #333">logging</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">getLogger</span><span class="p">(</span><span class="n" style="color: #333">levelName</span><span class="p">)</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="134" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="170" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

170

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC170" class="line">    <span class="n" style="color: #333">tempLog</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">setLevel</span><span class="p">(</span><span class="n" style="color: #333">logLevel</span><span class="p">)</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="134" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="171" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

171

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC171" class="line">    <span class="c" style="color: #998; font-style: italic"># Create the output handler</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="134" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="172" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

172

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC172" class="line">    <span class="n" style="color: #333">ch</span> <span class="o" style="font-weight: bold">=</span> <span class="n" style="color: #333">logging</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">StreamHandler</span><span class="p">()</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="134" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="173" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

173

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC173" class="line">    <span class="n" style="color: #333">ch</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">setLevel</span><span class="p">(</span><span class="n" style="color: #333">logLevel</span><span class="p">)</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="134" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="174" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

174

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC174" class="line">    <span class="c" style="color: #998; font-style: italic"># Apply the format to the handler</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="134" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="175" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

175

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC175" class="line">    <span class="n" style="color: #333">ch</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">setFormatter</span><span class="p">(</span><span class="n" style="color: #333">logFormat</span><span class="p">)</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="134" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="176" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

176

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC176" class="line">    <span class="c" style="color: #998; font-style: italic"># Apply the handler object to the logging object</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="134" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="177" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

177

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC177" class="line">    <span class="n" style="color: #333">tempLog</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">addHandler</span><span class="p">(</span><span class="n" style="color: #333">ch</span><span class="p">)</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="134" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="178" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

178

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC178" class="line">    <span class="k" style="font-weight: bold">return</span> <span class="n" style="color: #333">tempLog</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="134" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="179" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

179

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC179" class="line"></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="134" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="180" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

180

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC180" class="line"><span class="k" style="font-weight: bold">def</span> <span class="nf" style="color: #900; font-weight: bold">logData</span><span class="p">(</span><span class="n" style="color: #333">log</span><span class="p">,</span> <span class="n" style="color: #333">data</span><span class="p">):</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="134" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="181" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

181

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC181" class="line">    <span class="s" style="color: #d14">"log the data"</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="134" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="182" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

182

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC182" class="line"><span class="o" style="font-weight: bold">>>>>>>></span> <span class="n" style="color: #333">Stashed</span> <span class="n" style="color: #333">changes</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="134" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

134

</td>

<td class="diff-line-num new_line" data-linenumber="183" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

183

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC183" class="line">    <span class="k" style="font-weight: bold">if</span> <span class="nb" style="color: #0086b3">type</span><span class="p">(</span><span class="n" style="color: #333">data</span><span class="p">)</span> <span class="ow" style="font-weight: bold">in</span> <span class="p">(</span><span class="nb" style="color: #0086b3">tuple</span><span class="p">,</span> <span class="nb" style="color: #0086b3">list</span><span class="p">):</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="135" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

135

</td>

<td class="diff-line-num new_line" data-linenumber="184" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

184

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC184" class="line">        <span class="k" style="font-weight: bold">for</span> <span class="n" style="color: #333">_item</span> <span class="ow" style="font-weight: bold">in</span> <span class="n" style="color: #333">data</span><span class="p">:</span></span>

</pre>

</td>

</tr>

<tr class="line_holder old" style="line-height: 1.6">

<td class="diff-line-num old old_line" data-linenumber="136" style="background: #f9d7dc; border-right-color: #fac5cd; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#f9d7dc">

136

</td>

<td class="diff-line-num new_line old" data-linenumber="185" style="background: #f9d7dc; border-right-color: #fac5cd; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#f9d7dc">

</td>

<td class="line_content noteable_line old" style="background: #fbe9eb; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#fbe9eb">

<pre style="margin: 0">-<span id="LC136" class="line">            <span class="n" style="color: #333">log<span class="idiff left right">ger</span></span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">info</span><span class="p">(</span><span class="n" style="color: #333">_item</span><span class="p">)</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="137" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="185" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

185

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC185" class="line">            <span class="n" style="color: #333">log</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">info</span><span class="p">(</span><span class="n" style="color: #333">_item</span><span class="p">)</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="137" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

137

</td>

<td class="diff-line-num new_line" data-linenumber="186" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

186

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC186" class="line">    <span class="k" style="font-weight: bold">else</span><span class="p">:</span></span>

</pre>

</td>

</tr>

<tr class="line_holder old" style="line-height: 1.6">

<td class="diff-line-num old old_line" data-linenumber="138" style="background: #f9d7dc; border-right-color: #fac5cd; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#f9d7dc">

138

</td>

<td class="diff-line-num new_line old" data-linenumber="187" style="background: #f9d7dc; border-right-color: #fac5cd; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#f9d7dc">

</td>

<td class="line_content noteable_line old" style="background: #fbe9eb; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#fbe9eb">

<pre style="margin: 0">-<span id="LC138" class="line">        <span class="n" style="color: #333">log<span class="idiff left right">ger</span></span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">info</span><span class="p">(</span><span class="n" style="color: #333">data</span><span class="p">)</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="139" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="187" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

187

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC187" class="line">        <span class="n" style="color: #333">log</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">info</span><span class="p">(</span><span class="n" style="color: #333">data</span><span class="p">)</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="139" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

139

</td>

<td class="diff-line-num new_line" data-linenumber="188" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

188

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC188" class="line"></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="140" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="189" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

189

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC189" class="line"><span class="o" style="font-weight: bold"><<<<<<<</span> <span class="n" style="color: #333">Updated</span> <span class="n" style="color: #333">upstream</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="140" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

140

</td>

<td class="diff-line-num new_line" data-linenumber="190" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

190

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC190" class="line"></span>

</pre>

</td>

</tr>

<tr class="line_holder" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="141" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

141

</td>

<td class="diff-line-num new_line" data-linenumber="191" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

191

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC191" class="line"><span class="k" style="font-weight: bold">def</span> <span class="nf" style="color: #900; font-weight: bold">log_with_multiple_files</span><span class="p">():</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="142" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

142

</td>

<td class="diff-line-num new_line" data-linenumber="192" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

192

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC192" class="line">    <span class="s" style="color: #d14">"Write the logs to individual files depending on sensor"</span></span>

</pre>

</td>

</tr>

<tr class="line_holder match" style="line-height: 1.6">

<td class="diff-line-num unfold js-unfold old_line" data-linenumber="147" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">...</td>

<td class="diff-line-num unfold js-unfold new_line" data-linenumber="197" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">...</td>

<td class="line_content match " style="background: #fafafa; color: rgba(0,0,0,0.3); padding-left: 0.5em; padding-right: 0.5em" bgcolor="#fafafa">@@ -147,15 +197,32 @@ def log_with_multiple_files():</td>

</tr>

<tr class="line_holder" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="147" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

147

</td>

<td class="diff-line-num new_line" data-linenumber="197" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

197

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC197" class="line">                              <span class="s" style="color: #d14">'cpu_levelname'</span><span class="p">,</span> <span class="n" style="color: #333">logging</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">INFO</span><span class="p">)</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="148" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

148

</td>

<td class="diff-line-num new_line" data-linenumber="198" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

198

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC198" class="line">    <span class="n" style="color: #333">hddLogger</span> <span class="o" style="font-weight: bold">=</span> <span class="n" style="color: #333">logging_setup</span><span class="p">(</span><span class="s" style="color: #d14">'/var/log/ntpstats/hddTemp.log'</span><span class="p">,</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="149" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

149

</td>

<td class="diff-line-num new_line" data-linenumber="199" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

199

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC199" class="line">                              <span class="s" style="color: #d14">'hdd_levelname'</span><span class="p">,</span> <span class="n" style="color: #333">logging</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">INFO</span><span class="p">)</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="150" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="200" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

200

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC200" class="line"><span class="o" style="font-weight: bold">=======</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="150" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="201" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

201

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC201" class="line"><span class="k" style="font-weight: bold">def</span> <span class="nf" style="color: #900; font-weight: bold">log_data</span><span class="p">():</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="150" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="202" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

202

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC202" class="line">    <span class="s" style="color: #d14">"Write all temperature readings to one file"</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="150" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="203" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

203

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC203" class="line">    <span class="k" style="font-weight: bold">try</span><span class="p">:</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="150" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="204" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

204

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC204" class="line">        <span class="c" style="color: #998; font-style: italic"># Create objects</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="150" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="205" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

205

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC205" class="line">        <span class="n" style="color: #333">cpu</span>  <span class="o" style="font-weight: bold">=</span> <span class="n" style="color: #333">CpuTemp</span><span class="p">()</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="150" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="206" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

206

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC206" class="line">        <span class="n" style="color: #333">zone</span> <span class="o" style="font-weight: bold">=</span> <span class="n" style="color: #333">ZoneTemp</span><span class="p">()</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="150" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="207" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

207

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC207" class="line">        <span class="n" style="color: #333">hdd</span>  <span class="o" style="font-weight: bold">=</span> <span class="n" style="color: #333">SmartCtl</span><span class="p">()</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="150" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="208" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

208

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC208" class="line">    <span class="k" style="font-weight: bold">except</span> <span class="nb" style="color: #0086b3">IOError</span> <span class="k" style="font-weight: bold">as</span> <span class="n" style="color: #333">ioe</span><span class="p">:</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="150" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="209" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

209

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC209" class="line">        <span class="n" style="color: #333">sys</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">stderr</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">write</span><span class="p">(</span><span class="s" style="color: #d14">"Unable to run: "</span> <span class="o" style="font-weight: bold">+</span> <span class="nb" style="color: #0086b3">str</span><span class="p">(</span><span class="n" style="color: #333">ioe</span><span class="p">)</span> <span class="o" style="font-weight: bold">+</span> <span class="s" style="color: #d14">"</span><span class="se" style="color: #d14">\n</span><span class="s" style="color: #d14">"</span><span class="p">)</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="150" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="210" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

210

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC210" class="line">        <span class="n" style="color: #333">sys</span><span class="o" style="font-weight: bold">.</span><span class="nb" style="color: #0086b3">exit</span><span class="p">(</span><span class="mi" style="color: #099">1</span><span class="p">)</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="150" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="211" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

211

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC211" class="line">    <span class="c" style="color: #998; font-style: italic"># Create the logger instance</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="150" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="212" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

212

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC212" class="line">    <span class="n" style="color: #333">zoneLogger</span> <span class="o" style="font-weight: bold">=</span> <span class="n" style="color: #333">logging_setup</span><span class="p">(</span><span class="n" style="color: #333">log</span><span class="p">,</span> <span class="s" style="color: #d14">'zone'</span><span class="p">,</span> <span class="n" style="color: #333">logging</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">INFO</span><span class="p">)</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="150" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="213" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

213

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC213" class="line">    <span class="n" style="color: #333">cpuLogger</span>  <span class="o" style="font-weight: bold">=</span> <span class="n" style="color: #333">logging_setup</span><span class="p">(</span><span class="n" style="color: #333">log</span><span class="p">,</span> <span class="s" style="color: #d14">'cpu'</span><span class="p">,</span> <span class="n" style="color: #333">logging</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">INFO</span><span class="p">)</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="150" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="214" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

214

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC214" class="line">    <span class="n" style="color: #333">hddLogger</span>  <span class="o" style="font-weight: bold">=</span> <span class="n" style="color: #333">logging_setup</span><span class="p">(</span><span class="n" style="color: #333">log</span><span class="p">,</span> <span class="s" style="color: #d14">'hdd'</span><span class="p">,</span> <span class="n" style="color: #333">logging</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">INFO</span><span class="p">)</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="150" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="215" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

215

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC215" class="line"><span class="o" style="font-weight: bold">>>>>>>></span> <span class="n" style="color: #333">Stashed</span> <span class="n" style="color: #333">changes</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="150" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

150

</td>

<td class="diff-line-num new_line" data-linenumber="216" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

216

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC216" class="line"></span>

</pre>

</td>

</tr>

<tr class="line_holder" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="151" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

151

</td>

<td class="diff-line-num new_line" data-linenumber="217" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

217

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC217" class="line">    <span class="c" style="color: #998; font-style: italic"># Write data to their respective logs forever</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="152" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

152

</td>

<td class="diff-line-num new_line" data-linenumber="218" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

218

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC218" class="line">    <span class="k" style="font-weight: bold">while</span> <span class="bp" style="color: #999">True</span><span class="p">:</span></span>

</pre>

</td>

</tr>

<tr class="line_holder old" style="line-height: 1.6">

<td class="diff-line-num old old_line" data-linenumber="153" style="background: #f9d7dc; border-right-color: #fac5cd; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#f9d7dc">

153

</td>

<td class="diff-line-num new_line old" data-linenumber="219" style="background: #f9d7dc; border-right-color: #fac5cd; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#f9d7dc">

</td>

<td class="line_content noteable_line old" style="background: #fbe9eb; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#fbe9eb">

<pre style="margin: 0">-<span id="LC153" class="line">        <span class="n" style="color: #333">log<span class="idiff left right">_d</span>ata</span><span class="p">(</span><span class="n" style="color: #333">zoneLogger</span><span class="p">,</span> <span class="n" style="color: #333">zone</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">get_data</span><span class="p">())</span></span>

</pre>

</td>

</tr>

<tr class="line_holder old" style="line-height: 1.6">

<td class="diff-line-num old old_line" data-linenumber="154" style="background: #f9d7dc; border-right-color: #fac5cd; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#f9d7dc">

154

</td>

<td class="diff-line-num new_line old" data-linenumber="219" style="background: #f9d7dc; border-right-color: #fac5cd; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#f9d7dc">

</td>

<td class="line_content noteable_line old" style="background: #fbe9eb; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#fbe9eb">

<pre style="margin: 0">-<span id="LC154" class="line">        <span class="n" style="color: #333">log<span class="idiff left right">_d</span>ata</span><span class="p">(</span><span class="n" style="color: #333">cpuLogger</span><span class="p">,</span> <span class="n" style="color: #333">cpu</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">get_data</span><span class="p">())</span></span>

</pre>

</td>

</tr>

<tr class="line_holder old" style="line-height: 1.6">

<td class="diff-line-num old old_line" data-linenumber="155" style="background: #f9d7dc; border-right-color: #fac5cd; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#f9d7dc">

155

</td>

<td class="diff-line-num new_line old" data-linenumber="219" style="background: #f9d7dc; border-right-color: #fac5cd; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#f9d7dc">

</td>

<td class="line_content noteable_line old" style="background: #fbe9eb; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#fbe9eb">

<pre style="margin: 0">-<span id="LC155" class="line">        <span class="n" style="color: #333">log<span class="idiff left right">_d</span>ata</span><span class="p">(</span><span class="n" style="color: #333">hddLogger</span><span class="p">,</span> <span class="n" style="color: #333">hdd</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">get_data</span><span class="p">())</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="156" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="219" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

219

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC219" class="line">        <span class="n" style="color: #333">log<span class="idiff left right">D</span>ata</span><span class="p">(</span><span class="n" style="color: #333">zoneLogger</span><span class="p">,</span> <span class="n" style="color: #333">zone</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">get_data</span><span class="p">())</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="156" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="220" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

220

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC220" class="line">        <span class="n" style="color: #333">log<span class="idiff left right">D</span>ata</span><span class="p">(</span><span class="n" style="color: #333">cpuLogger</span><span class="p">,</span> <span class="n" style="color: #333">cpu</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">get_data</span><span class="p">())</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="156" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="221" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

221

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC221" class="line">        <span class="n" style="color: #333">log<span class="idiff left right">D</span>ata</span><span class="p">(</span><span class="n" style="color: #333">hddLogger</span><span class="p">,</span> <span class="n" style="color: #333">hdd</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">get_data</span><span class="p">())</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="156" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

156

</td>

<td class="diff-line-num new_line" data-linenumber="222" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

222

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC222" class="line">        <span class="c" style="color: #998; font-style: italic"># Sleep 15 seconds</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="157" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

157

</td>

<td class="diff-line-num new_line" data-linenumber="223" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

223

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC223" class="line">        <span class="n" style="color: #333">time</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">sleep</span><span class="p">(</span><span class="mi" style="color: #099">15</span><span class="p">)</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="158" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

158

</td>

<td class="diff-line-num new_line" data-linenumber="224" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

224

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC224" class="line"></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="159" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="225" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

225

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC225" class="line"><span class="o" style="font-weight: bold"><<<<<<<</span> <span class="n" style="color: #333">Updated</span> <span class="n" style="color: #333">upstream</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="159" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

159

</td>

<td class="diff-line-num new_line" data-linenumber="226" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

226

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC226" class="line"></span>

</pre>

</td>

</tr>

<tr class="line_holder" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="160" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

160

</td>

<td class="diff-line-num new_line" data-linenumber="227" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

227

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC227" class="line"><span class="k" style="font-weight: bold">def</span> <span class="nf" style="color: #900; font-weight: bold">log_with_one_file</span><span class="p">():</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="161" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

161

</td>

<td class="diff-line-num new_line" data-linenumber="228" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

228

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC228" class="line">    <span class="s" style="color: #d14">"Write all temperature readings to one file"</span></span>

</pre>

</td>

</tr>

<tr class="line_holder match" style="line-height: 1.6">

<td class="diff-line-num unfold js-unfold old_line" data-linenumber="168" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">...</td>

<td class="diff-line-num unfold js-unfold new_line" data-linenumber="235" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">...</td>

<td class="line_content match " style="background: #fafafa; color: rgba(0,0,0,0.3); padding-left: 0.5em; padding-right: 0.5em" bgcolor="#fafafa">@@ -168,13 +235,29 @@ def log_with_one_file():</td>

</tr>

<tr class="line_holder" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="168" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

168

</td>

<td class="diff-line-num new_line" data-linenumber="235" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

235

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC235" class="line">                              <span class="s" style="color: #d14">'hdd_levelname'</span><span class="p">,</span> <span class="n" style="color: #333">logging</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">INFO</span><span class="p">)</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="169" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

169

</td>

<td class="diff-line-num new_line" data-linenumber="236" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

236

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC236" class="line"></span>

</pre>

</td>

</tr>

<tr class="line_holder" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="170" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

170

</td>

<td class="diff-line-num new_line" data-linenumber="237" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

237

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC237" class="line">    <span class="c" style="color: #998; font-style: italic"># Write data to their respective logs forever</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="171" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="238" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

238

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC238" class="line"><span class="o" style="font-weight: bold">=======</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="171" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="239" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

239

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC239" class="line"><span class="k" style="font-weight: bold">def</span> <span class="nf" style="color: #900; font-weight: bold">display</span><span class="p">():</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="171" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="240" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

240

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC240" class="line">    <span class="k" style="font-weight: bold">try</span><span class="p">:</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="171" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="241" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

241

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC241" class="line">        <span class="c" style="color: #998; font-style: italic"># Create objects</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="171" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="242" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

242

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC242" class="line">        <span class="n" style="color: #333">cpu</span>  <span class="o" style="font-weight: bold">=</span> <span class="n" style="color: #333">CpuTemp</span><span class="p">()</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="171" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="243" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

243

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC243" class="line">        <span class="n" style="color: #333">zone</span> <span class="o" style="font-weight: bold">=</span> <span class="n" style="color: #333">ZoneTemp</span><span class="p">()</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="171" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="244" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

244

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC244" class="line">        <span class="n" style="color: #333">hdd</span>  <span class="o" style="font-weight: bold">=</span> <span class="n" style="color: #333">SmartCtl</span><span class="p">()</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="171" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="245" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

245

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC245" class="line">    <span class="k" style="font-weight: bold">except</span> <span class="nb" style="color: #0086b3">IOError</span> <span class="k" style="font-weight: bold">as</span> <span class="n" style="color: #333">ioe</span><span class="p">:</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="171" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="246" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

246

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC246" class="line">        <span class="n" style="color: #333">sys</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">stderr</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">write</span><span class="p">(</span><span class="s" style="color: #d14">"Unable to run: "</span> <span class="o" style="font-weight: bold">+</span> <span class="nb" style="color: #0086b3">str</span><span class="p">(</span><span class="n" style="color: #333">ioe</span><span class="p">)</span> <span class="o" style="font-weight: bold">+</span> <span class="s" style="color: #d14">"</span><span class="se" style="color: #d14">\n</span><span class="s" style="color: #d14">"</span><span class="p">)</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="171" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="247" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

247

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC247" class="line">        <span class="n" style="color: #333">sys</span><span class="o" style="font-weight: bold">.</span><span class="nb" style="color: #0086b3">exit</span><span class="p">(</span><span class="mi" style="color: #099">1</span><span class="p">)</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="171" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="248" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

248

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC248" class="line"></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="171" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="249" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

249

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC249" class="line">    <span class="n" style="color: #333">zoneLogger</span> <span class="o" style="font-weight: bold">=</span> <span class="n" style="color: #333">console_log_setup</span><span class="p">(</span><span class="s" style="color: #d14">'zone'</span><span class="p">,</span> <span class="n" style="color: #333">logging</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">INFO</span><span class="p">)</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="171" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="250" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

250

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC250" class="line">    <span class="n" style="color: #333">cpuLogger</span>  <span class="o" style="font-weight: bold">=</span> <span class="n" style="color: #333">console_log_setup</span><span class="p">(</span><span class="s" style="color: #d14">'cpu'</span><span class="p">,</span> <span class="n" style="color: #333">logging</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">INFO</span><span class="p">)</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="171" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="251" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

251

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC251" class="line">    <span class="n" style="color: #333">hddLogger</span>  <span class="o" style="font-weight: bold">=</span> <span class="n" style="color: #333">console_log_setup</span><span class="p">(</span><span class="s" style="color: #d14">'hdd'</span><span class="p">,</span> <span class="n" style="color: #333">logging</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">INFO</span><span class="p">)</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="171" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="252" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

252

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC252" class="line"><span class="o" style="font-weight: bold">>>>>>>></span> <span class="n" style="color: #333">Stashed</span> <span class="n" style="color: #333">changes</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="171" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

171

</td>

<td class="diff-line-num new_line" data-linenumber="253" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

253

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC253" class="line">    <span class="k" style="font-weight: bold">while</span> <span class="bp" style="color: #999">True</span><span class="p">:</span></span>

</pre>

</td>

</tr>

<tr class="line_holder old" style="line-height: 1.6">

<td class="diff-line-num old old_line" data-linenumber="172" style="background: #f9d7dc; border-right-color: #fac5cd; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#f9d7dc">

172

</td>

<td class="diff-line-num new_line old" data-linenumber="254" style="background: #f9d7dc; border-right-color: #fac5cd; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#f9d7dc">

</td>

<td class="line_content noteable_line old" style="background: #fbe9eb; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#fbe9eb">

<pre style="margin: 0">-<span id="LC172" class="line">        <span class="n" style="color: #333">log<span class="idiff left right">_d</span>ata</span><span class="p">(</span><span class="n" style="color: #333">zoneLogger</span><span class="p">,</span> <span class="n" style="color: #333">zone</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">get_data</span><span class="p">())</span></span>

</pre>

</td>

</tr>

<tr class="line_holder old" style="line-height: 1.6">

<td class="diff-line-num old old_line" data-linenumber="173" style="background: #f9d7dc; border-right-color: #fac5cd; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#f9d7dc">

173

</td>

<td class="diff-line-num new_line old" data-linenumber="254" style="background: #f9d7dc; border-right-color: #fac5cd; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#f9d7dc">

</td>

<td class="line_content noteable_line old" style="background: #fbe9eb; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#fbe9eb">

<pre style="margin: 0">-<span id="LC173" class="line">        <span class="n" style="color: #333">log<span class="idiff left right">_d</span>ata</span><span class="p">(</span><span class="n" style="color: #333">cpuLogger</span><span class="p">,</span> <span class="n" style="color: #333">cpu</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">get_data</span><span class="p">())</span></span>

</pre>

</td>

</tr>

<tr class="line_holder old" style="line-height: 1.6">

<td class="diff-line-num old old_line" data-linenumber="174" style="background: #f9d7dc; border-right-color: #fac5cd; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#f9d7dc">

174

</td>

<td class="diff-line-num new_line old" data-linenumber="254" style="background: #f9d7dc; border-right-color: #fac5cd; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#f9d7dc">

</td>

<td class="line_content noteable_line old" style="background: #fbe9eb; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#fbe9eb">

<pre style="margin: 0">-<span id="LC174" class="line">        <span class="n" style="color: #333">log<span class="idiff left right">_d</span>ata</span><span class="p">(</span><span class="n" style="color: #333">hddLogger</span><span class="p">,</span> <span class="n" style="color: #333">hdd</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">get_data</span><span class="p">())</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="175" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="254" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

254

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC254" class="line">        <span class="n" style="color: #333">log<span class="idiff left right">D</span>ata</span><span class="p">(</span><span class="n" style="color: #333">zoneLogger</span><span class="p">,</span> <span class="n" style="color: #333">zone</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">get_data</span><span class="p">())</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="175" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="255" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

255

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC255" class="line">        <span class="n" style="color: #333">log<span class="idiff left right">D</span>ata</span><span class="p">(</span><span class="n" style="color: #333">cpuLogger</span><span class="p">,</span> <span class="n" style="color: #333">cpu</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">get_data</span><span class="p">())</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="175" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="256" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

256

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC256" class="line">        <span class="n" style="color: #333">log<span class="idiff left right">D</span>ata</span><span class="p">(</span><span class="n" style="color: #333">hddLogger</span><span class="p">,</span> <span class="n" style="color: #333">hdd</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">get_data</span><span class="p">())</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="175" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

175

</td>

<td class="diff-line-num new_line" data-linenumber="257" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

257

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC257" class="line">        <span class="c" style="color: #998; font-style: italic"># Sleep 15 seconds</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="176" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

176

</td>

<td class="diff-line-num new_line" data-linenumber="258" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

258

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC258" class="line">        <span class="n" style="color: #333">time</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">sleep</span><span class="p">(</span><span class="mi" style="color: #099">15</span><span class="p">)</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="177" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

177

</td>

<td class="diff-line-num new_line" data-linenumber="259" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

259

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC259" class="line"></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="178" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="260" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

260

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC260" class="line"><span class="o" style="font-weight: bold"><<<<<<<</span> <span class="n" style="color: #333">Updated</span> <span class="n" style="color: #333">upstream</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="178" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

178

</td>

<td class="diff-line-num new_line" data-linenumber="261" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

261

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC261" class="line"></span>

</pre>

</td>

</tr>

<tr class="line_holder" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="179" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

179

</td>

<td class="diff-line-num new_line" data-linenumber="262" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

262

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC262" class="line"><span class="k" style="font-weight: bold">def</span> <span class="nf" style="color: #900; font-weight: bold">help_text</span><span class="p">():</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="180" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

180

</td>

<td class="diff-line-num new_line" data-linenumber="263" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

263

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC263" class="line">    <span class="s" style="color: #d14">"Help message"</span></span>

</pre>

</td>

</tr>

<tr class="line_holder match" style="line-height: 1.6">

<td class="diff-line-num unfold js-unfold old_line" data-linenumber="211" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">...</td>

<td class="diff-line-num unfold js-unfold new_line" data-linenumber="294" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">...</td>

<td class="line_content match " style="background: #fafafa; color: rgba(0,0,0,0.3); padding-left: 0.5em; padding-right: 0.5em" bgcolor="#fafafa">@@ -211,3 +294,32 @@ except KeyboardInterrupt:</td>

</tr>

<tr class="line_holder" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="211" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

211

</td>

<td class="diff-line-num new_line" data-linenumber="294" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

294

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC294" class="line"><span class="k" style="font-weight: bold">except</span><span class="p">:</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="212" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

212

</td>

<td class="diff-line-num new_line" data-linenumber="295" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

295

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC295" class="line">    <span class="n" style="color: #333">help_text</span><span class="p">()</span></span>

</pre>

</td>

</tr>

<tr class="line_holder" style="line-height: 1.6">

<td class="diff-line-num old_line" data-linenumber="213" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

213

</td>

<td class="diff-line-num new_line" data-linenumber="296" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">

296

</td>

<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">

<pre style="margin: 0"> <span id="LC296" class="line">    <span class="n" style="color: #333">sys</span><span class="o" style="font-weight: bold">.</span><span class="nb" style="color: #0086b3">exit</span><span class="p">(</span><span class="mi" style="color: #099">1</span><span class="p">)</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="214" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="297" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

297

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC297" class="line"><span class="o" style="font-weight: bold">=======</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="214" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="298" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

298

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC298" class="line"><span class="c" style="color: #998; font-style: italic"># Work with argvars</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="214" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="299" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

299

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC299" class="line"><span class="n" style="color: #333">parser</span> <span class="o" style="font-weight: bold">=</span> <span class="n" style="color: #333">argparse</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">ArgumentParser</span><span class="p">(</span><span class="n" style="color: #333">description</span><span class="o" style="font-weight: bold">=</span><span class="s" style="color: #d14">"Temperature sensor daemon"</span><span class="p">,</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="214" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="300" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

300

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC300" class="line">                                 <span class="n" style="color: #333">epilog</span><span class="o" style="font-weight: bold">=</span><span class="s" style="color: #d14">"""See the manual page for details."""</span><span class="p">)</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="214" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="301" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

301

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC301" class="line"><span class="n" style="color: #333">parser</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">add_argument</span><span class="p">(</span><span class="s" style="color: #d14">'-l'</span><span class="p">,</span> <span class="s" style="color: #d14">'--logfile'</span><span class="p">,</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="214" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="302" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

302

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC302" class="line">                    <span class="n" style="color: #333">dest</span><span class="o" style="font-weight: bold">=</span><span class="s" style="color: #d14">'logfile'</span><span class="p">,</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="214" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="303" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

303

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC303" class="line">                    <span class="n" style="color: #333">help</span><span class="o" style="font-weight: bold">=</span><span class="s" style="color: #d14">"append log data to LOGFILE instead of stdout"</span><span class="p">,</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="214" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="304" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

304

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC304" class="line">                    <span class="n" style="color: #333">nargs</span><span class="o" style="font-weight: bold">=</span><span class="mi" style="color: #099">1</span><span class="p">)</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="214" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="305" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

305

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC305" class="line"><span class="n" style="color: #333">parser</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">add_argument</span><span class="p">(</span><span class="s" style="color: #d14">'-V'</span><span class="p">,</span> <span class="s" style="color: #d14">'--version'</span><span class="p">,</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="214" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="306" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

306

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC306" class="line">                    <span class="n" style="color: #333">dest</span><span class="o" style="font-weight: bold">=</span><span class="s" style="color: #d14">'version'</span><span class="p">,</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="214" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="307" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

307

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC307" class="line">                    <span class="n" style="color: #333">help</span><span class="o" style="font-weight: bold">=</span><span class="s" style="color: #d14">"Display the version and exit"</span><span class="p">,</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="214" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="308" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

308

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC308" class="line">                    <span class="n" style="color: #333">action</span><span class="o" style="font-weight: bold">=</span><span class="s" style="color: #d14">'store_true'</span><span class="p">)</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="214" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="309" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

309

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC309" class="line"></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="214" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="310" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

310

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC310" class="line"><span class="n" style="color: #333">args</span> <span class="o" style="font-weight: bold">=</span> <span class="n" style="color: #333">parser</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">parse_args</span><span class="p">()</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="214" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="311" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

311

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC311" class="line"><span class="k" style="font-weight: bold">if</span> <span class="n" style="color: #333">args</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">version</span><span class="p">:</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="214" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="312" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

312

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC312" class="line">    <span class="k" style="font-weight: bold">print</span><span class="p">(</span><span class="s" style="color: #d14">"temp-log v. "</span> <span class="o" style="font-weight: bold">+</span> <span class="nb" style="color: #0086b3">str</span><span class="p">(</span><span class="n" style="color: #333">version</span><span class="p">))</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="214" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="313" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

313

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC313" class="line"></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="214" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="314" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

314

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC314" class="line"><span class="k" style="font-weight: bold">elif</span> <span class="n" style="color: #333">args</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">logfile</span><span class="p">:</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="214" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="315" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

315

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC315" class="line">    <span class="k" style="font-weight: bold">try</span><span class="p">:</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="214" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="316" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

316

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC316" class="line">        <span class="n" style="color: #333">log</span> <span class="o" style="font-weight: bold">=</span> <span class="n" style="color: #333">args</span><span class="o" style="font-weight: bold">.</span><span class="n" style="color: #333">logfile</span><span class="p">[</span><span class="mi" style="color: #099">0</span><span class="p">]</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="214" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="317" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

317

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC317" class="line">        <span class="n" style="color: #333">log_data</span><span class="p">()</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="214" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="318" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

318

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC318" class="line">    <span class="k" style="font-weight: bold">except</span> <span class="p">(</span><span class="nb" style="color: #0086b3">KeyboardInterrupt</span><span class="p">,</span> <span class="nb" style="color: #0086b3">SystemExit</span><span class="p">):</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="214" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="319" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

319

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC319" class="line">        <span class="n" style="color: #333">sys</span><span class="o" style="font-weight: bold">.</span><span class="nb" style="color: #0086b3">exit</span><span class="p">(</span><span class="mi" style="color: #099">0</span><span class="p">)</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="214" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="320" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

320

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC320" class="line"><span class="k" style="font-weight: bold">else</span><span class="p">:</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="214" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="321" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

321

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC321" class="line">    <span class="k" style="font-weight: bold">try</span><span class="p">:</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="214" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="322" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

322

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC322" class="line">        <span class="n" style="color: #333">display</span><span class="p">()</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="214" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="323" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

323

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC323" class="line">    <span class="k" style="font-weight: bold">except</span> <span class="p">(</span><span class="nb" style="color: #0086b3">KeyboardInterrupt</span><span class="p">,</span> <span class="nb" style="color: #0086b3">SystemExit</span><span class="p">):</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="214" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="324" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

324

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC324" class="line">        <span class="n" style="color: #333">sys</span><span class="o" style="font-weight: bold">.</span><span class="nb" style="color: #0086b3">exit</span><span class="p">(</span><span class="mi" style="color: #099">0</span><span class="p">)</span></span>

</pre>

</td>

</tr>

<tr class="line_holder new" style="line-height: 1.6">

<td class="diff-line-num new old_line" data-linenumber="214" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

</td>

<td class="diff-line-num new new_line" data-linenumber="325" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">

325

</td>

<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">

<pre style="margin: 0">+<span id="LC325" class="line"><span class="o" style="font-weight: bold">>>>>>>></span> <span class="n" style="color: #333">Stashed</span> <span class="n" style="color: #333">changes</span></span></pre>

</td>

</tr>

</table>

<br>

</li>

</div>

<div class="footer" style="margin-top: 10px">

<p style="color: #777; font-size: small">

—

<br>

<a href="https://gitlab.com/NTPsec/ntpsec/commit/45693051ea816249605303b94dddd7ffd4f27d15">View it on GitLab</a>.

<br>

You're receiving this email because of your account on gitlab.com.

If you'd like to receive fewer emails, you can

adjust your notification settings.

<script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","action":{"@type":"ViewAction","name":"View Commit","url":"https://gitlab.com/NTPsec/ntpsec/commit/45693051ea816249605303b94dddd7ffd4f27d15"}}</script>

</p>

</div>

</body>

</html>