<!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=US-ASCII" http-equiv="Content-Type">
<title>
GitLab
</title>
<style>img {
max-width: 100%; height: auto;
}
</style>
</head>
<body>
<div class="content">
<h3>
Holger Levsen pushed to branch develop
at <a href="https://salsa.debian.org/debian/piuparts">Debian / piuparts</a>
</h3>
<h4>
Commits:
</h4>
<ul>
<li>
<strong><a href="https://salsa.debian.org/debian/piuparts/commit/fecdaba6f39213553911ad8f544127641b67a531">fecdaba6</a></strong>
<div>
<span>by Nis Martensen</span>
<i>at 2019-12-25T21:39:26Z</i>
</div>
<pre class="commit-message" style="white-space: pre-wrap; margin: 0;">piupartslib/conf.py: decode subprocess.Popen().stdout
subprocess.Popen().stdout is a byte string in python3. We need to decode
it since we want a unicode string here.
</pre>
</li>
</ul>
<h4>1 changed file:</h4>
<ul>
<li class="file-stats">
<a href="#26c92757fea8bb0959dbd2756845c9a530827fc3">
piupartslib/conf.py
</a>
</li>
</ul>
<h4>Changes:</h4>
<li id="26c92757fea8bb0959dbd2756845c9a530827fc3">
<a href="https://salsa.debian.org/debian/piuparts/commit/fecdaba6f39213553911ad8f544127641b67a531#26c92757fea8bb0959dbd2756845c9a530827fc3"><strong>piupartslib/conf.py</strong></a>
<hr>
<table class="code white" style="font-family: monospace; font-size: 90%;" 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="152" 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="152" 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">@@ -152,7 +152,7 @@ class Config(UserDict):</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="152" 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">
152
</td>
<td class="diff-line-num new_line" data-linenumber="152" 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">
152
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC152" class="line" lang="python"> <span class="c1" style="color: #998; font-style: italic;"># Try to figure it out ourselves, using dpkg</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="153" 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">
153
</td>
<td class="diff-line-num new_line" data-linenumber="153" 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">
153
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC153" class="line" lang="python"> <span class="n" style="color: #333;">p</span> <span class="o" style="font-weight: 600;">=</span> <span class="n" style="color: #333;">subprocess</span><span class="o" style="font-weight: 600;">.</span><span class="n" style="color: #333;">Popen</span><span class="p">([</span><span class="s" style="color: #d14;">"dpkg"</span><span class="p">,</span> <span class="s" style="color: #d14;">"--print-architecture"</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="154" 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">
154
</td>
<td class="diff-line-num new_line" data-linenumber="154" 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">
154
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC154" class="line" lang="python"> <span class="n" style="color: #333;">stdout</span><span class="o" style="font-weight: 600;">=</span><span class="n" style="color: #333;">subprocess</span><span class="o" style="font-weight: 600;">.</span><span class="n" style="color: #333;">PIPE</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="155" 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">
155
</td>
<td class="diff-line-num new_line old" data-linenumber="155" 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 old" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#fbe9eb">
<pre style="margin: 0;">-<span id="LC155" class="line" lang="python"> <span class="bp" style="color: #999;">self</span><span class="p">[</span><span class="s" style="color: #d14;">"arch"</span><span class="p">]</span> <span class="o" style="font-weight: 600;">=</span> <span class="n" style="color: #333;">p</span><span class="o" style="font-weight: 600;">.</span><span class="n" style="color: #333;">stdout</span><span class="o" style="font-weight: 600;">.</span><span class="n" style="color: #333;">read</span><span class="p">()</span><span class="o" style="font-weight: 600;">.</span><span class="n" style="color: #333;">rstrip</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="156" 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="155" 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">
155
</td>
<td class="line_content new" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#ecfdf0">
<pre style="margin: 0;">+<span id="LC155" class="line" lang="python"> <span class="bp" style="color: #999;">self</span><span class="p">[</span><span class="s" style="color: #d14;">"arch"</span><span class="p">]</span> <span class="o" style="font-weight: 600;">=</span> <span class="n" style="color: #333;">p</span><span class="o" style="font-weight: 600;">.</span><span class="n" style="color: #333;">stdout</span><span class="o" style="font-weight: 600;">.</span><span class="n" style="color: #333;">read</span><span class="p">()</span><span class="o" style="font-weight: 600;">.</span><span class="n" style="color: #333;"><span class="idiff left">decode</span></span><span class="p"><span class="idiff">()</span></span><span class="o" style="font-weight: 600;"><span class="idiff right">.</span></span><span class="n" style="color: #333;">rstrip</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="156" 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">
156
</td>
<td class="diff-line-num new_line" data-linenumber="156" 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">
156
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC156" class="line" lang="python"> <span class="k" style="font-weight: 600;">return</span> <span class="bp" style="color: #999;">self</span><span class="p">[</span><span class="s" style="color: #d14;">"arch"</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="157" 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">
157
</td>
<td class="diff-line-num new_line" data-linenumber="157" 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">
157
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC157" class="line" lang="python"></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="158" 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">
158
</td>
<td class="diff-line-num new_line" data-linenumber="158" 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">
158
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC158" class="line" lang="python"></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://salsa.debian.org/debian/piuparts/commit/fecdaba6f39213553911ad8f544127641b67a531">View it on GitLab</a>.
<br>
You're receiving this email because of your account on salsa.debian.org.
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://salsa.debian.org/debian/piuparts/commit/fecdaba6f39213553911ad8f544127641b67a531"}}</script>
</p>
</div>
</body>
</html>