trx_toolkit: fix: do not use 'is' / 'is not' with string and numerical literals
Since version 3.8, Python warnins us that using the "is" and "is not" operators with string and numerical literals is a bad idea. Let's avoid this and use the classical '==' and '!=' operators instead. Change-Id: Iaed86d630ac1e0b9b4f72bbf3c788e325783456d Bug description: https://bugs.python.org/issue34850
This commit is contained in:
parent
eb0560e19e
commit
2605d96720
|
@ -4,7 +4,7 @@
|
||||||
# TRX Toolkit
|
# TRX Toolkit
|
||||||
# Virtual Um-interface (fake transceiver)
|
# Virtual Um-interface (fake transceiver)
|
||||||
#
|
#
|
||||||
# (C) 2017-2018 by Vadim Yanitskiy <axilirator@gmail.com>
|
# (C) 2017-2019 by Vadim Yanitskiy <axilirator@gmail.com>
|
||||||
#
|
#
|
||||||
# All Rights Reserved
|
# All Rights Reserved
|
||||||
#
|
#
|
||||||
|
@ -22,7 +22,7 @@
|
||||||
# with this program; if not, write to the Free Software Foundation, Inc.,
|
# with this program; if not, write to the Free Software Foundation, Inc.,
|
||||||
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||||
|
|
||||||
APP_CR_HOLDERS = [("2017-2018", "Vadim Yanitskiy <axilirator@gmail.com>")]
|
APP_CR_HOLDERS = [("2017-2019", "Vadim Yanitskiy <axilirator@gmail.com>")]
|
||||||
|
|
||||||
import logging as log
|
import logging as log
|
||||||
import signal
|
import signal
|
||||||
|
@ -131,7 +131,7 @@ class FakeTRX(Transceiver):
|
||||||
@property
|
@property
|
||||||
def toa256(self):
|
def toa256(self):
|
||||||
# Check if randomization is required
|
# Check if randomization is required
|
||||||
if self.toa256_rand_threshold is 0:
|
if self.toa256_rand_threshold == 0:
|
||||||
return self.toa256_base
|
return self.toa256_base
|
||||||
|
|
||||||
# Generate a random ToA value in required range
|
# Generate a random ToA value in required range
|
||||||
|
@ -142,7 +142,7 @@ class FakeTRX(Transceiver):
|
||||||
@property
|
@property
|
||||||
def rssi(self):
|
def rssi(self):
|
||||||
# Check if randomization is required
|
# Check if randomization is required
|
||||||
if self.rssi_rand_threshold is 0:
|
if self.rssi_rand_threshold == 0:
|
||||||
return self.rssi_base
|
return self.rssi_base
|
||||||
|
|
||||||
# Generate a random RSSI value in required range
|
# Generate a random RSSI value in required range
|
||||||
|
@ -153,7 +153,7 @@ class FakeTRX(Transceiver):
|
||||||
@property
|
@property
|
||||||
def ci(self):
|
def ci(self):
|
||||||
# Check if randomization is required
|
# Check if randomization is required
|
||||||
if self.ci_rand_threshold is 0:
|
if self.ci_rand_threshold == 0:
|
||||||
return self.ci_base
|
return self.ci_base
|
||||||
|
|
||||||
# Generate a random C/I value in required range
|
# Generate a random C/I value in required range
|
||||||
|
@ -165,7 +165,7 @@ class FakeTRX(Transceiver):
|
||||||
# Returns: True - drop, False - keep
|
# Returns: True - drop, False - keep
|
||||||
def sim_burst_drop(self, msg):
|
def sim_burst_drop(self, msg):
|
||||||
# Check if dropping is required
|
# Check if dropping is required
|
||||||
if self.burst_drop_amount is 0:
|
if self.burst_drop_amount == 0:
|
||||||
return False
|
return False
|
||||||
|
|
||||||
if msg.fn % self.burst_drop_period == 0:
|
if msg.fn % self.burst_drop_period == 0:
|
||||||
|
@ -212,7 +212,7 @@ class FakeTRX(Transceiver):
|
||||||
self._handle_data_msg_v1(src_msg, msg)
|
self._handle_data_msg_v1(src_msg, msg)
|
||||||
|
|
||||||
# Apply optional Timing Advance
|
# Apply optional Timing Advance
|
||||||
if src_trx.ta is not 0:
|
if src_trx.ta != 0:
|
||||||
msg.toa256 -= src_trx.ta * 256
|
msg.toa256 -= src_trx.ta * 256
|
||||||
|
|
||||||
# Path loss simulation
|
# Path loss simulation
|
||||||
|
@ -384,7 +384,7 @@ class Application(ApplicationBase):
|
||||||
|
|
||||||
def append_child_trx(self, remote_addr, base_port, child_idx, name = None):
|
def append_child_trx(self, remote_addr, base_port, child_idx, name = None):
|
||||||
# Index 0 corresponds to the first transceiver
|
# Index 0 corresponds to the first transceiver
|
||||||
if child_idx is 0:
|
if child_idx == 0:
|
||||||
self.append_trx(remote_addr, base_port, name)
|
self.append_trx(remote_addr, base_port, name)
|
||||||
return
|
return
|
||||||
|
|
||||||
|
|
|
@ -112,7 +112,7 @@ class Application(ApplicationBase):
|
||||||
msg.validate()
|
msg.validate()
|
||||||
except ValueError as e:
|
except ValueError as e:
|
||||||
desc = msg.desc_hdr()
|
desc = msg.desc_hdr()
|
||||||
if desc is "":
|
if desc == "":
|
||||||
desc = "parsing error"
|
desc = "parsing error"
|
||||||
log.warning("Ignoring an incorrect message (%s): %s" % (desc, e))
|
log.warning("Ignoring an incorrect message (%s): %s" % (desc, e))
|
||||||
self.cnt_burst_dropped_num += 1
|
self.cnt_burst_dropped_num += 1
|
||||||
|
|
Loading…
Reference in New Issue