<!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>
<style>img {
max-width: 100%; height: auto;
}
</style>
</head>
<body>
<div class="content">
<h3>
Gary E. Miller 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/4b46d4b2141dfd933f2a9ab000e4f19ead6d14b9">4b46d4b2</a></strong>
<div>
<span>by Gary E. Miller</span>
<i>at 2017-08-15T15:24:01-07:00</i>
</div>
<pre class="commit-message" style="white-space: pre-wrap; margin: 0;">ntpmon: Python 3 fix, remove uneeded/broken UTF-8 conversion.
</pre>
</li>
</ul>
<h4>1 changed file:</h4>
<ul>
<li class="file-stats">
<a href="#729df8c63dcbf1ea15ae4a0c70cb810da673db37">
ntpclients/ntpmon
</a>
</li>
</ul>
<h4>Changes:</h4>
<li id="729df8c63dcbf1ea15ae4a0c70cb810da673db37">
<a href="https://gitlab.com/NTPsec/ntpsec/commit/4b46d4b2141dfd933f2a9ab000e4f19ead6d14b9#729df8c63dcbf1ea15ae4a0c70cb810da673db37"><strong>ntpclients/ntpmon</strong></a>
<hr>
<table class="code white" style="font-family: monospace; font-size: 12px;" bgcolor="#fff" width="100%" cellpadding="0" cellspacing="0">
<tr class="line_holder match" id="" style="line-height: 1.6;">
<td class="diff-line-num unfold js-unfold old_line" data-linenumber="351" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">...</td>
<td class="diff-line-num unfold js-unfold new_line" data-linenumber="351" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">...</td>
<td class="line_content match " style="padding-left: 0.5em; padding-right: 0.5em; color: rgba(0,0,0,0.3);" bgcolor="#fafafa">@@ -351,7 +351,7 @@ if __name__ == '__main__':</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="351" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
351
</td>
<td class="diff-line-num new_line" data-linenumber="351" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
351
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC351" class="line" lang="python"> <span class="n" style="color: #333;">dtype</span> <span class="o" style="font-weight: bold;">=</span> <span class="n" style="color: #333;">ntp</span><span class="o" style="font-weight: bold;">.</span><span class="n" style="color: #333;">ntpc</span><span class="o" style="font-weight: bold;">.</span><span class="n" style="color: #333;">TYPE_PEER</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="352" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
352
</td>
<td class="diff-line-num new_line" data-linenumber="352" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
352
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC352" class="line" lang="python"> <span class="n" style="color: #333;">sw</span> <span class="o" style="font-weight: bold;">=</span> <span class="n" style="color: #333;">ntp</span><span class="o" style="font-weight: bold;">.</span><span class="n" style="color: #333;">ntpc</span><span class="o" style="font-weight: bold;">.</span><span class="n" style="color: #333;">statustoa</span><span class="p">(</span><span class="n" style="color: #333;">dtype</span><span class="p">,</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="353" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
353
</td>
<td class="diff-line-num new_line" data-linenumber="353" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
353
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC353" class="line" lang="python"> <span class="n" style="color: #333;">peers</span><span class="p">[</span><span class="n" style="color: #333;">selected</span><span class="p">]</span><span class="o" style="font-weight: bold;">.</span><span class="n" style="color: #333;">status</span><span class="p">)</span></span>
</pre>
</td>
</tr>
<tr class="line_holder old" id="" style="line-height: 1.6;">
<td class="diff-line-num old old_line" data-linenumber="354" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #fac5cd; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#f9d7dc">
354
</td>
<td class="diff-line-num new_line old" data-linenumber="354" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #fac5cd; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#f9d7dc">
</td>
<td class="line_content noteable_line old" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#fbe9eb">
<pre style="margin: 0;">-<span id="LC354" class="line" lang="python"> <span class="n" style="color: #333;">strconvert</span> <span class="o" style="font-weight: bold;">=</span> <span class="s" style="color: #d14;"><span class="idiff left">u"assoc=</span></span><span class="si" style="color: #d14;"><span class="idiff">%</span></span><span class="s" style="color: #d14;"><span class="idiff">d: </span></span><span class="si" style="color: #d14;"><span class="idiff">%</span></span><span class="s" style="color: #d14;"><span class="idiff">s</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="o" style="font-weight: bold;"><span class="idiff">.</span></span><span class="n" style="color: #333;"><span class="idiff">encode</span></span><span class="p"><span class="idiff">(</span></span><span class="s" style="color: #d14;"><span class="idiff">'UTF-8'</span></span><span class="p"><span class="idiff right">)</span></span></span>
</pre>
</td>
</tr>
<tr class="line_holder new" id="" style="line-height: 1.6;">
<td class="diff-line-num new old_line" data-linenumber="355" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#ddfbe6">
</td>
<td class="diff-line-num new new_line" data-linenumber="354" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#ddfbe6">
354
</td>
<td class="line_content new noteable_line" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#ecfdf0">
<pre style="margin: 0;">+<span id="LC354" class="line" lang="python"> <span class="n" style="color: #333;">strconvert</span> <span class="o" style="font-weight: bold;">=</span> <span class="s" style="color: #d14;"><span class="idiff left">"assoc=</span></span><span class="si" style="color: #d14;"><span class="idiff">%</span></span><span class="s" style="color: #d14;"><span class="idiff">d: </span></span><span class="si" style="color: #d14;"><span class="idiff">%</span></span><span class="s" style="color: #d14;"><span class="idiff">s</span></span><span class="se" style="color: #d14;"><span class="idiff">\n</span></span><span class="s" style="color: #d14;"><span class="idiff right">"</span></span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="355" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
355
</td>
<td class="diff-line-num new_line" data-linenumber="355" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
355
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC355" class="line" lang="python"> <span class="n" style="color: #333;">stdscr</span><span class="o" style="font-weight: bold;">.</span><span class="n" style="color: #333;">addstr</span><span class="p">(</span><span class="n" style="color: #333;">strconvert</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="356" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
356
</td>
<td class="diff-line-num new_line" data-linenumber="356" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
356
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC356" class="line" lang="python"> <span class="o" style="font-weight: bold;">%</span> <span class="p">(</span><span class="n" style="color: #333;">peers</span><span class="p">[</span><span class="n" style="color: #333;">selected</span><span class="p">]</span><span class="o" style="font-weight: bold;">.</span><span class="n" style="color: #333;">associd</span><span class="p">,</span> <span class="n" style="color: #333;">sw</span><span class="p">))</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="357" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
357
</td>
<td class="diff-line-num new_line" data-linenumber="357" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
357
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC357" class="line" lang="python"> <span class="n" style="color: #333;">strconvert</span> <span class="o" style="font-weight: bold;">=</span> <span class="n" style="color: #333;">peer_detail</span><span class="p">(</span><span class="n" style="color: #333;">retained</span><span class="p">,</span> <span class="n" style="color: #333;">showunits</span><span class="p">)</span></span>
</pre>
</td>
</tr>
</table>
<br>
</li>
</div>
<div class="footer" style="margin-top: 10px;">
<p style="font-size: small; color: #777;">
—
<br>
<a href="https://gitlab.com/NTPsec/ntpsec/commit/4b46d4b2141dfd933f2a9ab000e4f19ead6d14b9">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/4b46d4b2141dfd933f2a9ab000e4f19ead6d14b9"}}</script>
</p>
</div>
</body>
</html>