<p>fixeria has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmocom-bb/+/19291">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">trx_toolkit: get rid of Python2 specific workarounds<br><br>Change-Id: I16c63205c9133d964048588c25867ac7c310f951<br>---<br>M src/target/trx_toolkit/data_dump.py<br>M src/target/trx_toolkit/transceiver.py<br>2 files changed, 1 insertion(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/91/19291/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/target/trx_toolkit/data_dump.py b/src/target/trx_toolkit/data_dump.py</span><br><span>index fb3dca5..9a68556 100644</span><br><span>--- a/src/target/trx_toolkit/data_dump.py</span><br><span>+++ b/src/target/trx_toolkit/data_dump.py</span><br><span>@@ -83,8 +83,6 @@</span><br><span>                       self.f = capture</span><br><span> </span><br><span>         def __del__(self):</span><br><span style="color: hsl(0, 100%, 40%);">-              # FIXME: this causes an Exception in Python 2 (but not in Python 3)</span><br><span style="color: hsl(0, 100%, 40%);">-             # AttributeError: 'NoneType' object has no attribute 'info'</span><br><span>          log.info("Closing the capture file")</span><br><span>               self.f.close()</span><br><span> </span><br><span>diff --git a/src/target/trx_toolkit/transceiver.py b/src/target/trx_toolkit/transceiver.py</span><br><span>index 03c60fb..9fc2948 100644</span><br><span>--- a/src/target/trx_toolkit/transceiver.py</span><br><span>+++ b/src/target/trx_toolkit/transceiver.py</span><br><span>@@ -326,8 +326,7 @@</span><br><span> </span><br><span>        def tx_queue_clear(self):</span><br><span>            with self._tx_queue_lock:</span><br><span style="color: hsl(0, 100%, 40%);">-                       # TODO: Python3: self._tx_queue.clear()</span><br><span style="color: hsl(0, 100%, 40%);">-                 del self._tx_queue[:]</span><br><span style="color: hsl(120, 100%, 40%);">+                 self._tx_queue.clear()</span><br><span> </span><br><span>   def clck_tick(self, fwd, fn):</span><br><span>                if not self.running:</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmocom-bb/+/19291">change 19291</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/osmocom-bb/+/19291"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmocom-bb </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I16c63205c9133d964048588c25867ac7c310f951 </div>
<div style="display:none"> Gerrit-Change-Number: 19291 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>