Various python3 related changes
- Use relative import for grgsm's modules
- Convert map to list
- Remove the hier_block.py workaround as as gnuradio 3.7 is no longer
supported in this branch
Change-Id: I5ca8fd340823996e8c444aaf18ddacd85c92ab1c
diff --git a/python/trx/__init__.py b/python/trx/__init__.py
index c8bddbe..23042b0 100644
--- a/python/trx/__init__.py
+++ b/python/trx/__init__.py
@@ -20,10 +20,10 @@
This is a set of helper classes for the grgsm_trx application.
'''
-from udp_link import UDPLink
-from ctrl_if import CTRLInterface
-from ctrl_if_bb import CTRLInterfaceBB
-from radio_if import RadioInterface
-from transceiver import Transceiver
+from .udp_link import UDPLink
+from .ctrl_if import CTRLInterface
+from .ctrl_if_bb import CTRLInterfaceBB
+from .radio_if import RadioInterface
+from .transceiver import Transceiver
-from dict_toggle_sign import dict_toggle_sign
+from .dict_toggle_sign import dict_toggle_sign
diff --git a/python/trx/ctrl_if.py b/python/trx/ctrl_if.py
index 1a7c0c3..d7e14f1 100644
--- a/python/trx/ctrl_if.py
+++ b/python/trx/ctrl_if.py
@@ -22,7 +22,7 @@
# with this program; if not, write to the Free Software Foundation, Inc.,
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-from udp_link import UDPLink
+from .udp_link import UDPLink
class CTRLInterface(UDPLink):
def handle_rx(self, data, remote):
diff --git a/python/trx/ctrl_if_bb.py b/python/trx/ctrl_if_bb.py
index 4814263..1c21c55 100644
--- a/python/trx/ctrl_if_bb.py
+++ b/python/trx/ctrl_if_bb.py
@@ -22,7 +22,7 @@
# with this program; if not, write to the Free Software Foundation, Inc.,
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-from ctrl_if import CTRLInterface
+from .ctrl_if import CTRLInterface
class CTRLInterfaceBB(CTRLInterface):
def __init__(self, trx, *ctrl_if_args):
diff --git a/python/trx/radio_if.py b/python/trx/radio_if.py
index 0d844c0..acbc3cd 100644
--- a/python/trx/radio_if.py
+++ b/python/trx/radio_if.py
@@ -38,7 +38,7 @@
from gnuradio import filter
from gnuradio.filter import firdes
-from dict_toggle_sign import dict_toggle_sign
+from .dict_toggle_sign import dict_toggle_sign
class RadioInterface(gr.top_block):
# PHY specific variables
diff --git a/python/trx/radio_if_uhd.py b/python/trx/radio_if_uhd.py
index ef2e0ed..664a51c 100644
--- a/python/trx/radio_if_uhd.py
+++ b/python/trx/radio_if_uhd.py
@@ -24,7 +24,7 @@
from gnuradio import uhd
-from radio_if import RadioInterface
+from .radio_if import RadioInterface
class RadioInterfaceUHD(RadioInterface):
# Human-readable description
diff --git a/python/trx/transceiver.py b/python/trx/transceiver.py
index 837a61f..4e706e3 100644
--- a/python/trx/transceiver.py
+++ b/python/trx/transceiver.py
@@ -22,7 +22,7 @@
# with this program; if not, write to the Free Software Foundation, Inc.,
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-from ctrl_if_bb import CTRLInterfaceBB
+from .ctrl_if_bb import CTRLInterfaceBB
class Transceiver:
""" Base transceiver implementation.