From 2f09c018a5692457b5a31f4aaf6fd8bbf0fa31c2 Mon Sep 17 00:00:00 2001
From: Jeff Long <willcode4@gmail.com>
Date: Mon, 13 Feb 2023 16:22:14 -0500
Subject: [PATCH] Revert "grc: remove duplicate import, move imports to
 template code"

This reverts commit 6a48d5fde7839955d0775b5f3d91c3cd6fc13c69.
---
 blocks/options.block.yml          | 14 ++++++++++++++
 core/generator/flow_graph.py.mako | 10 ----------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/blocks/options.block.yml b/blocks/options.block.yml
index 7ec3d41..eb59482 100644
--- a/blocks/options.block.yml
+++ b/blocks/options.block.yml
@@ -137,6 +137,20 @@ asserts:
 - ${ all(i >= 0 for i in placement) }
 
 templates:
+    imports: |-
+        from gnuradio import gr
+        from gnuradio.filter import firdes
+        from gnuradio.fft import window
+        import sys
+        import signal
+        % if generate_options == 'qt_gui':
+        from PyQt5 import Qt
+        % endif
+        % if not generate_options.startswith('hb'):
+        from argparse import ArgumentParser
+        from gnuradio.eng_arg import eng_float, intx
+        from gnuradio import eng_notation
+        % endif
     callbacks:
     - 'if ${run}: self.start()
 
diff --git a/core/generator/flow_graph.py.mako b/core/generator/flow_graph.py.mako
index 158dae3..2ba5401 100644
--- a/core/generator/flow_graph.py.mako
+++ b/core/generator/flow_graph.py.mako
@@ -24,16 +24,6 @@
 ########################################################
 ##Create Imports
 ########################################################
-import sys
-import signal
-from gnuradio import gr
-from gnuradio.filter import firdes
-from gnuradio.fft import window
-% if not generate_options.startswith('hb'):
-from argparse import ArgumentParser
-from gnuradio.eng_arg import eng_float, intx
-from gnuradio import eng_notation
-% endif
 % if generate_options == 'qt_gui':
 from packaging.version import Version as StrictVersion
 from PyQt5 import Qt