<!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/eadb0d5b28cfd363cea14e6075a20a6e028dcc38">eadb0d5b</a></strong>
<div>
<span>by Gary E. Miller</span>
<i>at 2017-08-15T14:13:49-07:00</i>
</div>
<pre class="commit-message" style="white-space: pre-wrap; margin: 0;">Another fix on Python 3 missing basestring and unicode()
</pre>
</li>
</ul>
<h4>2 changed files:</h4>
<ul>
<li class="file-stats">
<a href="#729df8c63dcbf1ea15ae4a0c70cb810da673db37">
ntpclients/ntpmon
</a>
</li>
<li class="file-stats">
<a href="#a61fb9541c7ffe95e3b809ea55001114580d13e4">
pylib/util.py
</a>
</li>
</ul>
<h4>Changes:</h4>
<li id="729df8c63dcbf1ea15ae4a0c70cb810da673db37">
<a href="https://gitlab.com/NTPsec/ntpsec/commit/eadb0d5b28cfd363cea14e6075a20a6e028dcc38#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="282" 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="282" 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">@@ -282,7 +282,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="282" 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">
282
</td>
<td class="diff-line-num new_line" data-linenumber="282" 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">
282
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC282" class="line" lang="python"> <span class="k" style="font-weight: bold;">raise</span> <span class="n" style="color: #333;">Fatal</span><span class="p">(</span><span class="n" style="color: #333;">e</span><span class="o" style="font-weight: bold;">.</span><span class="n" style="color: #333;">message</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="283" 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">
283
</td>
<td class="diff-line-num new_line" data-linenumber="283" 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">
283
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC283" class="line" lang="python"> <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;">e</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="284" 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">
284
</td>
<td class="diff-line-num new_line" data-linenumber="284" 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">
284
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC284" class="line" lang="python"> <span class="k" style="font-weight: bold;">raise</span> <span class="n" style="color: #333;">Fatal</span><span class="p">(</span><span class="n" style="color: #333;">e</span><span class="o" style="font-weight: bold;">.</span><span class="n" style="color: #333;">strerror</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="285" 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">
285
</td>
<td class="diff-line-num new_line old" data-linenumber="285" 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="LC285" class="line" lang="python"> <span class="n" style="color: #333;">strconvert</span> <span class="o" style="font-weight: bold;">=</span> <span class="nb" style="color: #0086b3;"><span class="idiff left">unicode</span></span><span class="p"><span class="idiff">(</span></span><span class="n" style="color: #333;"><span class="idiff">peer_report</span></span><span class="o" style="font-weight: bold;"><span class="idiff">.</span></span><span class="n" style="color: #333;"><span class="idiff">header</span></span><span class="p"><span class="idiff">()</span></span><span class="idiff"> </span><span class="o" style="font-weight: bold;"><span class="idiff">+</span></span><span class="idiff"> </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" id="" style="line-height: 1.6;">
<td class="diff-line-num new old_line" data-linenumber="286" 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="285" 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">
285
</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="LC285" 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;"><span class="idiff left">peer_report</span></span><span class="o" style="font-weight: bold;"><span class="idiff">.</span></span><span class="n" style="color: #333;"><span class="idiff">header</span></span><span class="p"><span class="idiff">()</span></span><span class="idiff"> </span><span class="o" style="font-weight: bold;"><span class="idiff">+</span></span><span class="idiff"> </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 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="286" 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">
286
</td>
<td class="diff-line-num new_line" data-linenumber="286" 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">
286
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC286" 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 class="o" style="font-weight: bold;">.</span><span class="n" style="color: #333;">encode</span><span class="p">(</span><span class="s" style="color: #d14;">'UTF-8'</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="287" 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">
287
</td>
<td class="diff-line-num new_line" data-linenumber="287" 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">
287
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC287" class="line" lang="python"> <span class="n" style="color: #333;">curses</span><span class="o" style="font-weight: bold;">.</span><span class="n" style="color: #333;">A_BOLD</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="288" 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">
288
</td>
<td class="diff-line-num new_line" data-linenumber="288" 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">
288
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC288" class="line" lang="python"> <span class="k" style="font-weight: bold;">else</span><span class="p">:</span></span>
</pre>
</td>
</tr>
</table>
<br>
</li>
<li id="a61fb9541c7ffe95e3b809ea55001114580d13e4">
<a href="https://gitlab.com/NTPsec/ntpsec/commit/eadb0d5b28cfd363cea14e6075a20a6e028dcc38#a61fb9541c7ffe95e3b809ea55001114580d13e4"><strong>pylib/util.py</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="399" 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="399" 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">@@ -399,7 +399,7 @@ def unitify(value, startingunit, baseunit=None, width=8):</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="399" 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">
399
</td>
<td class="diff-line-num new_line" data-linenumber="399" 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">
399
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC399" class="line" lang="python"><span class="k" style="font-weight: bold;">def</span> <span class="nf" style="color: #900; font-weight: bold;">f8dot4</span><span class="p">(</span><span class="n" style="color: #333;">f</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="400" 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">
400
</td>
<td class="diff-line-num new_line" data-linenumber="400" 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">
400
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC400" class="line" lang="python"> <span class="s" style="color: #d14;">"Scaled floating point formatting to fit in 8 characters"</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="401" 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">
401
</td>
<td class="diff-line-num new_line" data-linenumber="401" 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">
401
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC401" class="line" lang="python"></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="402" 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">
402
</td>
<td class="diff-line-num new_line old" data-linenumber="402" 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="LC402" class="line" lang="python"> <span class="k" style="font-weight: bold;">if</span> <span class="nb" style="color: #0086b3;">isinstance</span><span class="p">(</span><span class="n" style="color: #333;">f</span><span class="p">,</span> <span class="n" style="color: #333;">str<span class="idiff left right">ing</span></span><span class="p">):</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="403" 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="402" 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">
402
</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="LC402" class="line" lang="python"> <span class="k" style="font-weight: bold;">if</span> <span class="nb" style="color: #0086b3;">isinstance</span><span class="p">(</span><span class="n" style="color: #333;">f</span><span class="p">,</span> <span class="nb" style="color: #0086b3;">str</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="403" 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">
403
</td>
<td class="diff-line-num new_line" data-linenumber="403" 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">
403
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC403" class="line" lang="python"> <span class="c" style="color: #998; font-style: italic;"># a string? pass it on as a signal</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="404" 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">
404
</td>
<td class="diff-line-num new_line" data-linenumber="404" 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">
404
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC404" class="line" lang="python"> <span class="k" style="font-weight: bold;">return</span> <span class="s" style="color: #d14;">"</span><span class="si" style="color: #d14;">%8</span><span class="s" style="color: #d14;">s"</span> <span class="o" style="font-weight: bold;">%</span> <span class="n" style="color: #333;">f</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="405" 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">
405
</td>
<td class="diff-line-num new_line" data-linenumber="405" 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">
405
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC405" class="line" lang="python"> <span class="k" style="font-weight: bold;">if</span> <span class="ow" style="font-weight: bold;">not</span> <span class="nb" style="color: #0086b3;">isinstance</span><span class="p">(</span><span class="n" style="color: #333;">f</span><span class="p">,</span> <span class="p">(</span><span class="nb" style="color: #0086b3;">int</span><span class="p">,</span> <span class="nb" style="color: #0086b3;">float</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/eadb0d5b28cfd363cea14e6075a20a6e028dcc38">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/eadb0d5b28cfd363cea14e6075a20a6e028dcc38"}}</script>
</p>
</div>
</body>
</html>