summaryrefslogtreecommitdiff
path: root/gnuradio-runtime/python/gnuradio
diff options
context:
space:
mode:
Diffstat (limited to 'gnuradio-runtime/python/gnuradio')
-rw-r--r--gnuradio-runtime/python/gnuradio/__init__.py3
-rw-r--r--gnuradio-runtime/python/gnuradio/gr/CMakeLists.txt1
-rw-r--r--gnuradio-runtime/python/gnuradio/gr/__init__.py31
-rwxr-xr-xgnuradio-runtime/python/gnuradio/gr/qa_tag_utils.py3
-rw-r--r--gnuradio-runtime/python/gnuradio/gr/tag_utils.py31
5 files changed, 37 insertions, 32 deletions
diff --git a/gnuradio-runtime/python/gnuradio/__init__.py b/gnuradio-runtime/python/gnuradio/__init__.py
index 433a65ded2..1e2966bd08 100644
--- a/gnuradio-runtime/python/gnuradio/__init__.py
+++ b/gnuradio-runtime/python/gnuradio/__init__.py
@@ -45,3 +45,6 @@ if path.endswith(path_ending):
__path__.append(os.path.join(build_path, 'gr-fcd', 'python'))
__path__.append(os.path.join(build_path, 'gr-comedi', 'python'))
__path__.append(os.path.join(build_path, 'gr-channels', 'python'))
+ __path__.append(os.path.join(build_path, 'gr-fec', 'python'))
+ __path__.append(os.path.join(build_path, 'gr-utils', 'python'))
+ __path__.append(os.path.join(build_path, 'gr-uhd', 'python'))
diff --git a/gnuradio-runtime/python/gnuradio/gr/CMakeLists.txt b/gnuradio-runtime/python/gnuradio/gr/CMakeLists.txt
index b4cf1c5fdf..053925bb3a 100644
--- a/gnuradio-runtime/python/gnuradio/gr/CMakeLists.txt
+++ b/gnuradio-runtime/python/gnuradio/gr/CMakeLists.txt
@@ -22,6 +22,7 @@ include(GrPython)
GR_PYTHON_INSTALL(FILES
__init__.py
+ tag_utils.py
gateway.py
gr_threading.py
gr_threading_23.py
diff --git a/gnuradio-runtime/python/gnuradio/gr/__init__.py b/gnuradio-runtime/python/gnuradio/gr/__init__.py
index 7ceefb27a5..94a5c9ec2b 100644
--- a/gnuradio-runtime/python/gnuradio/gr/__init__.py
+++ b/gnuradio-runtime/python/gnuradio/gr/__init__.py
@@ -43,37 +43,8 @@ except ImportError:
from exceptions import *
from top_block import *
from hier_block2 import *
-#from tag_utils import *
+from tag_utils import *
from gateway import basic_block, sync_block, decim_block, interp_block
# Force the preference database to be initialized
prefs = prefs.singleton
-
-
-class PythonTag(object):
- " Python container for tags "
- def __init__(self):
- self.offset = None
- self.key = None
- self.value = None
- self.srcid = None
-
-def tag_to_python(tag):
- """ Convert a stream tag to a Python-readable object """
- newtag = PythonTag()
- newtag.offset = tag.offset
- newtag.key = pmt.to_python(tag.key)
- newtag.value = pmt.to_python(tag.value)
- newtag.srcid = pmt.to_python(tag.srcid)
- return newtag
-
-def tag_to_pmt(tag):
- """ Convert a Python-readable object to a stream tag """
- newtag = gr.tag_t()
- newtag.offset = tag.offset
- newtag.key = pmt.to_python(tag.key)
- newtag.value = pmt.from_python(tag.value)
- newtag.srcid = pmt.from_python(tag.srcid)
- return newtag
-
-
diff --git a/gnuradio-runtime/python/gnuradio/gr/qa_tag_utils.py b/gnuradio-runtime/python/gnuradio/gr/qa_tag_utils.py
index 3a0e7889f9..56797a46dd 100755
--- a/gnuradio-runtime/python/gnuradio/gr/qa_tag_utils.py
+++ b/gnuradio-runtime/python/gnuradio/gr/qa_tag_utils.py
@@ -21,7 +21,6 @@
#
from gnuradio import gr, gr_unittest
-import tag_utils
try:
import pmt_swig as pmt
@@ -43,7 +42,7 @@ class test_tag_utils (gr_unittest.TestCase):
t.key = pmt.string_to_symbol('key')
t.value = pmt.from_long(23)
t.srcid = pmt.from_bool(False)
- pt = tag_utils.tag_to_python(t)
+ pt = gr.tag_to_python(t)
self.assertEqual(pt.key, 'key')
self.assertEqual(pt.value, 23)
self.assertEqual(pt.offset, 10)
diff --git a/gnuradio-runtime/python/gnuradio/gr/tag_utils.py b/gnuradio-runtime/python/gnuradio/gr/tag_utils.py
new file mode 100644
index 0000000000..ad80bff23a
--- /dev/null
+++ b/gnuradio-runtime/python/gnuradio/gr/tag_utils.py
@@ -0,0 +1,31 @@
+import pmt
+
+import runtime_swig as gr
+
+class PythonTag(object):
+ " Python container for tags "
+ def __init__(self):
+ self.offset = None
+ self.key = None
+ self.value = None
+ self.srcid = None
+
+def tag_to_python(tag):
+ """ Convert a stream tag to a Python-readable object """
+ newtag = PythonTag()
+ newtag.offset = tag.offset
+ newtag.key = pmt.to_python(tag.key)
+ newtag.value = pmt.to_python(tag.value)
+ newtag.srcid = pmt.to_python(tag.srcid)
+ return newtag
+
+def tag_to_pmt(tag):
+ """ Convert a Python-readable object to a stream tag """
+ newtag = gr.tag_t()
+ newtag.offset = tag.offset
+ newtag.key = pmt.to_python(tag.key)
+ newtag.value = pmt.from_python(tag.value)
+ newtag.srcid = pmt.from_python(tag.srcid)
+ return newtag
+
+