From 1e20f8e042019a9fbcb58c4a09231b93cd1daaa6 Mon Sep 17 00:00:00 2001 From: Vadim Yanitskiy Date: Thu, 16 Jul 2020 13:58:34 +0700 Subject: trx_toolkit: get rid of Python2 specific workarounds Change-Id: I16c63205c9133d964048588c25867ac7c310f951 --- src/target/trx_toolkit/data_dump.py | 2 -- src/target/trx_toolkit/transceiver.py | 3 +-- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/target/trx_toolkit/data_dump.py b/src/target/trx_toolkit/data_dump.py index fb3dca53..9a685563 100644 --- a/src/target/trx_toolkit/data_dump.py +++ b/src/target/trx_toolkit/data_dump.py @@ -83,8 +83,6 @@ class DATADumpFile(DATADump): self.f = capture def __del__(self): - # FIXME: this causes an Exception in Python 2 (but not in Python 3) - # AttributeError: 'NoneType' object has no attribute 'info' log.info("Closing the capture file") self.f.close() diff --git a/src/target/trx_toolkit/transceiver.py b/src/target/trx_toolkit/transceiver.py index 03c60fbe..9fc2948f 100644 --- a/src/target/trx_toolkit/transceiver.py +++ b/src/target/trx_toolkit/transceiver.py @@ -326,8 +326,7 @@ class Transceiver: def tx_queue_clear(self): with self._tx_queue_lock: - # TODO: Python3: self._tx_queue.clear() - del self._tx_queue[:] + self._tx_queue.clear() def clck_tick(self, fwd, fn): if not self.running: -- cgit v1.2.3