<p>fixeria has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/pysim/+/17152">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Py2 -> Py3: use the floor division operator // where possible<br><br>In Python 3, traditional division operator returns a float,<br>while we need a floor integer in the most cases.<br><br>Change-Id: I5565eb64a1ddea7075cbb142eaacaa5d494c87bb<br>---<br>M pySim/cards.py<br>M pySim/commands.py<br>M pySim/transport/serial.py<br>3 files changed, 12 insertions(+), 12 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/52/17152/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/pySim/cards.py b/pySim/cards.py</span><br><span>index faaeca3..b30e449 100644</span><br><span>--- a/pySim/cards.py</span><br><span>+++ b/pySim/cards.py</span><br><span>@@ -89,7 +89,7 @@</span><br><span> """</span><br><span> # get size and write EF.OPLMNwAcT</span><br><span> data = self._scc.read_binary(EF['OPLMNwAcT'], length=None, offset=0)</span><br><span style="color: hsl(0, 100%, 40%);">- size = len(data[0])/2</span><br><span style="color: hsl(120, 100%, 40%);">+ size = len(data[0]) // 2</span><br><span> hplmn = enc_plmn(mcc, mnc)</span><br><span> content = hplmn + access_tech</span><br><span> data, sw = self._scc.update_binary(EF['OPLMNwAcT'], content + 'ffffff0000' * (size/5-1))</span><br><span>@@ -101,7 +101,7 @@</span><br><span> """</span><br><span> # get size and write EF.PLMNwAcT</span><br><span> data = self._scc.read_binary(EF['PLMNwAcT'], length=None, offset=0)</span><br><span style="color: hsl(0, 100%, 40%);">- size = len(data[0])/2</span><br><span style="color: hsl(120, 100%, 40%);">+ size = len(data[0]) // 2</span><br><span> hplmn = enc_plmn(mcc, mnc)</span><br><span> content = hplmn + access_tech</span><br><span> data, sw = self._scc.update_binary(EF['PLMNwAcT'], content + 'ffffff0000' * (size/5-1))</span><br><span>@@ -109,7 +109,7 @@</span><br><span> </span><br><span> def update_plmnsel(self, mcc, mnc):</span><br><span> data = self._scc.read_binary(EF['PLMNsel'], length=None, offset=0)</span><br><span style="color: hsl(0, 100%, 40%);">- size = len(data[0])/2</span><br><span style="color: hsl(120, 100%, 40%);">+ size = len(data[0]) // 2</span><br><span> hplmn = enc_plmn(mcc, mnc)</span><br><span> data, sw = self._scc.update_binary(EF['PLMNsel'], hplmn + 'ff' * (size-3))</span><br><span> return sw</span><br><span>@@ -127,7 +127,7 @@</span><br><span> raise RuntimeError('unable to calculate proper mnclen')</span><br><span> </span><br><span> data = self._scc.read_binary(EF['AD'], length=None, offset=0)</span><br><span style="color: hsl(0, 100%, 40%);">- size = len(data[0])/2</span><br><span style="color: hsl(120, 100%, 40%);">+ size = len(data[0]) // 2</span><br><span> content = data[0][0:6] + "%02X" % mnclen</span><br><span> data, sw = self._scc.update_binary(EF['AD'], content)</span><br><span> return sw</span><br><span>diff --git a/pySim/commands.py b/pySim/commands.py</span><br><span>index 385cacf..ff64ed2 100644</span><br><span>--- a/pySim/commands.py</span><br><span>+++ b/pySim/commands.py</span><br><span>@@ -49,11 +49,11 @@</span><br><span> # what we get in the length field.</span><br><span> # See also ETSI TS 102 221, chapter 11.1.1.3.0 Base coding.</span><br><span> exp_tlv_len = int(fcp[2:4], 16)</span><br><span style="color: hsl(0, 100%, 40%);">- if len(fcp[4:])/2 == exp_tlv_len:</span><br><span style="color: hsl(120, 100%, 40%);">+ if len(fcp[4:]) // 2 == exp_tlv_len:</span><br><span> skip = 4</span><br><span> else:</span><br><span> exp_tlv_len = int(fcp[2:6], 16)</span><br><span style="color: hsl(0, 100%, 40%);">- if len(fcp[4:])/2 == exp_tlv_len:</span><br><span style="color: hsl(120, 100%, 40%);">+ if len(fcp[4:]) // 2 == exp_tlv_len:</span><br><span> skip = 6</span><br><span> </span><br><span> # Skip FCP tag and length</span><br><span>@@ -108,7 +108,7 @@</span><br><span> return rv</span><br><span> </span><br><span> def select_adf(self, aid):</span><br><span style="color: hsl(0, 100%, 40%);">- aidlen = ("0" + format(len(aid)/2, 'x'))[-2:]</span><br><span style="color: hsl(120, 100%, 40%);">+ aidlen = ("0" + format(len(aid) // 2, 'x'))[-2:]</span><br><span> return self._tp.send_apdu_checksw(self.cla_byte + "a4" + "0404" + aidlen + aid)</span><br><span> </span><br><span> def read_binary(self, ef, length=None, offset=0):</span><br><span>@@ -126,7 +126,7 @@</span><br><span> if not hasattr(type(ef), '__iter__'):</span><br><span> ef = [ef]</span><br><span> self.select_file(ef)</span><br><span style="color: hsl(0, 100%, 40%);">- pdu = self.cla_byte + 'd6%04x%02x' % (offset, len(data)/2) + data</span><br><span style="color: hsl(120, 100%, 40%);">+ pdu = self.cla_byte + 'd6%04x%02x' % (offset, len(data) // 2) + data</span><br><span> return self._tp.send_apdu_checksw(pdu)</span><br><span> </span><br><span> def read_record(self, ef, rec_no):</span><br><span>@@ -143,10 +143,10 @@</span><br><span> r = self.select_file(ef)</span><br><span> if not force_len:</span><br><span> rec_length = self.__record_len(r)</span><br><span style="color: hsl(0, 100%, 40%);">- if (len(data)/2 != rec_length):</span><br><span style="color: hsl(0, 100%, 40%);">- raise ValueError('Invalid data length (expected %d, got %d)' % (rec_length, len(data)/2))</span><br><span style="color: hsl(120, 100%, 40%);">+ if (len(data) // 2 != rec_length):</span><br><span style="color: hsl(120, 100%, 40%);">+ raise ValueError('Invalid data length (expected %d, got %d)' % (rec_length, len(data) // 2))</span><br><span> else:</span><br><span style="color: hsl(0, 100%, 40%);">- rec_length = len(data)/2</span><br><span style="color: hsl(120, 100%, 40%);">+ rec_length = len(data) // 2</span><br><span> pdu = (self.cla_byte + 'dc%02x04%02x' % (rec_no, rec_length)) + data</span><br><span> return self._tp.send_apdu_checksw(pdu)</span><br><span> </span><br><span>diff --git a/pySim/transport/serial.py b/pySim/transport/serial.py</span><br><span>index f672be2..11fcd6a 100644</span><br><span>--- a/pySim/transport/serial.py</span><br><span>+++ b/pySim/transport/serial.py</span><br><span>@@ -213,7 +213,7 @@</span><br><span> self._tx_string(pdu[5:])</span><br><span> </span><br><span> # Receive data (including SW !)</span><br><span style="color: hsl(0, 100%, 40%);">- # length = [P3 - tx_data (=len(pdu)-len(hdr)) + 2 (SW1/2) ]</span><br><span style="color: hsl(120, 100%, 40%);">+ # length = [P3 - tx_data (=len(pdu)-len(hdr)) + 2 (SW1//2) ]</span><br><span> to_recv = data_len - len(pdu) + 5 + 2</span><br><span> </span><br><span> data = ''</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/pysim/+/17152">change 17152</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/pysim/+/17152"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: pysim </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I5565eb64a1ddea7075cbb142eaacaa5d494c87bb </div>
<div style="display:none"> Gerrit-Change-Number: 17152 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: fixeria <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>