From 181b04de0b56b22599933036a19dfe157e31f43b Mon Sep 17 00:00:00 2001
From: Johannes Demel <demel@uni-bremen.de>
Date: Sun, 24 Mar 2019 19:24:32 +0100
Subject: modtool: Update Python templates
Update templates for Python blocks and Python QA code. Previously, these
templates created broken import statements. Also, a deprecated call to
`gr_unittest.run(...)` is updated to not include a filename argument
anymore. Finally, the python block signature generator was updated.
---
gr-utils/python/modtool/templates/templates.py | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
(limited to 'gr-utils/python')
diff --git a/gr-utils/python/modtool/templates/templates.py b/gr-utils/python/modtool/templates/templates.py
index f3a4e59055..e59bbc9b94 100644
--- a/gr-utils/python/modtool/templates/templates.py
+++ b/gr-utils/python/modtool/templates/templates.py
@@ -357,11 +357,11 @@ import numpy\
if blocktype == 'source':
inputsig = 'None'
else:
- inputsig = '[<+numpy.float32+>]'
+ inputsig = '[<+numpy.float32+>, ]'
if blocktype == 'sink':
outputsig = 'None'
else:
- outputsig = '[<+numpy.float32+>]'
+ outputsig = '[<+numpy.float32+>, ]'
%>
% else:
<%
@@ -404,8 +404,8 @@ class ${blockname}(${parenttype}):
<% return %>
% else:
name="${blockname}",
- in_sig="${inputsig}",
- out_sig="${outputsig}${deciminterp}")
+ in_sig=${inputsig},
+ out_sig=${outputsig}${deciminterp})
% endif
% if blocktype == 'general':
@@ -519,9 +519,9 @@ ${str_to_python_comment(license)}
from gnuradio import gr, gr_unittest
from gnuradio import blocks
% if lang == 'cpp':
-from . import ${modname}_swig as ${modname}
+import ${modname}_swig as ${modname}
% else:
-from .${blockname} import ${blockname}
+from ${blockname} import ${blockname}
% endif
class qa_${blockname}(gr_unittest.TestCase):
@@ -539,7 +539,7 @@ class qa_${blockname}(gr_unittest.TestCase):
if __name__ == '__main__':
- gr_unittest.run(qa_${blockname}, "qa_${blockname}.yml")
+ gr_unittest.run(qa_${blockname})
'''
Templates['grc_yml'] = '''id: ${modname}_${blockname}
--
cgit v1.2.3