<p>fixeria has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmocom-bb/+/16086">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">trx_toolkit: fix: do not use 'is' / 'is not' with string and numerical literals<br><br>Since version 3.8, Python warnins us that using the "is" and "is not"<br>operators with string and numerical literals is a bad idea. Let's<br>avoid this and use the classical '==' and '!=' operators instead.<br><br>Change-Id: Iaed86d630ac1e0b9b4f72bbf3c788e325783456d<br>Bug description: https://bugs.python.org/issue34850<br>---<br>M src/target/trx_toolkit/fake_trx.py<br>M src/target/trx_toolkit/trx_sniff.py<br>2 files changed, 9 insertions(+), 9 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/86/16086/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/target/trx_toolkit/fake_trx.py b/src/target/trx_toolkit/fake_trx.py</span><br><span>index 8beee6e..f226f03 100755</span><br><span>--- a/src/target/trx_toolkit/fake_trx.py</span><br><span>+++ b/src/target/trx_toolkit/fake_trx.py</span><br><span>@@ -4,7 +4,7 @@</span><br><span> # TRX Toolkit</span><br><span> # Virtual Um-interface (fake transceiver)</span><br><span> #</span><br><span style="color: hsl(0, 100%, 40%);">-# (C) 2017-2018 by Vadim Yanitskiy <axilirator@gmail.com></span><br><span style="color: hsl(120, 100%, 40%);">+# (C) 2017-2019 by Vadim Yanitskiy <axilirator@gmail.com></span><br><span> #</span><br><span> # All Rights Reserved</span><br><span> #</span><br><span>@@ -22,7 +22,7 @@</span><br><span> # with this program; if not, write to the Free Software Foundation, Inc.,</span><br><span> # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-APP_CR_HOLDERS = [("2017-2018", "Vadim Yanitskiy <axilirator@gmail.com>")]</span><br><span style="color: hsl(120, 100%, 40%);">+APP_CR_HOLDERS = [("2017-2019", "Vadim Yanitskiy <axilirator@gmail.com>")]</span><br><span> </span><br><span> import logging as log</span><br><span> import signal</span><br><span>@@ -131,7 +131,7 @@</span><br><span> @property</span><br><span> def toa256(self):</span><br><span> # Check if randomization is required</span><br><span style="color: hsl(0, 100%, 40%);">- if self.toa256_rand_threshold is 0:</span><br><span style="color: hsl(120, 100%, 40%);">+ if self.toa256_rand_threshold == 0:</span><br><span> return self.toa256_base</span><br><span> </span><br><span> # Generate a random ToA value in required range</span><br><span>@@ -142,7 +142,7 @@</span><br><span> @property</span><br><span> def rssi(self):</span><br><span> # Check if randomization is required</span><br><span style="color: hsl(0, 100%, 40%);">- if self.rssi_rand_threshold is 0:</span><br><span style="color: hsl(120, 100%, 40%);">+ if self.rssi_rand_threshold == 0:</span><br><span> return self.rssi_base</span><br><span> </span><br><span> # Generate a random RSSI value in required range</span><br><span>@@ -153,7 +153,7 @@</span><br><span> @property</span><br><span> def ci(self):</span><br><span> # Check if randomization is required</span><br><span style="color: hsl(0, 100%, 40%);">- if self.ci_rand_threshold is 0:</span><br><span style="color: hsl(120, 100%, 40%);">+ if self.ci_rand_threshold == 0:</span><br><span> return self.ci_base</span><br><span> </span><br><span> # Generate a random C/I value in required range</span><br><span>@@ -165,7 +165,7 @@</span><br><span> # Returns: True - drop, False - keep</span><br><span> def sim_burst_drop(self, msg):</span><br><span> # Check if dropping is required</span><br><span style="color: hsl(0, 100%, 40%);">- if self.burst_drop_amount is 0:</span><br><span style="color: hsl(120, 100%, 40%);">+ if self.burst_drop_amount == 0:</span><br><span> return False</span><br><span> </span><br><span> if msg.fn % self.burst_drop_period == 0:</span><br><span>@@ -212,7 +212,7 @@</span><br><span> self._handle_data_msg_v1(src_msg, msg)</span><br><span> </span><br><span> # Apply optional Timing Advance</span><br><span style="color: hsl(0, 100%, 40%);">- if src_trx.ta is not 0:</span><br><span style="color: hsl(120, 100%, 40%);">+ if src_trx.ta != 0:</span><br><span> msg.toa256 -= src_trx.ta * 256</span><br><span> </span><br><span> # Path loss simulation</span><br><span>@@ -384,7 +384,7 @@</span><br><span> </span><br><span> def append_child_trx(self, remote_addr, base_port, child_idx, name = None):</span><br><span> # Index 0 corresponds to the first transceiver</span><br><span style="color: hsl(0, 100%, 40%);">- if child_idx is 0:</span><br><span style="color: hsl(120, 100%, 40%);">+ if child_idx == 0:</span><br><span> self.append_trx(remote_addr, base_port, name)</span><br><span> return</span><br><span> </span><br><span>diff --git a/src/target/trx_toolkit/trx_sniff.py b/src/target/trx_toolkit/trx_sniff.py</span><br><span>index 7e5c2bd..6671c35 100755</span><br><span>--- a/src/target/trx_toolkit/trx_sniff.py</span><br><span>+++ b/src/target/trx_toolkit/trx_sniff.py</span><br><span>@@ -112,7 +112,7 @@</span><br><span> msg.validate()</span><br><span> except ValueError as e:</span><br><span> desc = msg.desc_hdr()</span><br><span style="color: hsl(0, 100%, 40%);">- if desc is "":</span><br><span style="color: hsl(120, 100%, 40%);">+ if desc == "":</span><br><span> desc = "parsing error"</span><br><span> log.warning("Ignoring an incorrect message (%s): %s" % (desc, e))</span><br><span> self.cnt_burst_dropped_num += 1</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmocom-bb/+/16086">change 16086</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/+/16086"/><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: Iaed86d630ac1e0b9b4f72bbf3c788e325783456d </div>
<div style="display:none"> Gerrit-Change-Number: 16086 </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>