<p>Ludovic Rousseau has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-sim-auth/+/20905">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">utils: add support of Python 3 for stringToByte()<br><br>Use a special case for Python 2.<br><br>Change-Id: I2ac97ff85bde5584fbe82880b3360c97d4cd54c1<br>---<br>M card/utils.py<br>1 file changed, 6 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-sim-auth refs/changes/05/20905/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/card/utils.py b/card/utils.py</span><br><span>index 3c1b1f1..e3777d7 100644</span><br><span>--- a/card/utils.py</span><br><span>+++ b/card/utils.py</span><br><span>@@ -24,6 +24,7 @@</span><br><span> </span><br><span> from collections import deque</span><br><span> from smartcard.util import toBytes</span><br><span style="color: hsl(120, 100%, 40%);">+import sys</span><br><span> </span><br><span> # from python 2.6, format('b') allows to use 0b10010110 notation: </span><br><span> # much convinient</span><br><span>@@ -50,7 +51,11 @@</span><br><span>     '''</span><br><span>     bytelist = []</span><br><span>     for c in string:</span><br><span style="color: hsl(0, 100%, 40%);">-        bytelist.extend( toBytes(c.encode('hex')) )</span><br><span style="color: hsl(120, 100%, 40%);">+        if sys.version_info[0] < 3:</span><br><span style="color: hsl(120, 100%, 40%);">+            # Python 2</span><br><span style="color: hsl(120, 100%, 40%);">+            bytelist.extend( toBytes(c.encode('hex')) )</span><br><span style="color: hsl(120, 100%, 40%);">+        else:</span><br><span style="color: hsl(120, 100%, 40%);">+            bytelist.append(c)</span><br><span>     return bytelist</span><br><span> </span><br><span> # equivalent to the pyscard function "toASCIIString"</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-sim-auth/+/20905">change 20905</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-sim-auth/+/20905"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-sim-auth </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I2ac97ff85bde5584fbe82880b3360c97d4cd54c1 </div>
<div style="display:none"> Gerrit-Change-Number: 20905 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Ludovic Rousseau <ludovic.rousseau+osmocom@free.fr> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>