diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2017-09-22 16:27:53 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2017-09-22 16:27:53 -0700 |
| commit | 831d993725fc6d58edb6a8e1008f8c84ec52f2d3 (patch) | |
| tree | 9b2ff9f1aaf36cfe1ea50287dbc49a3ab901ea03 | |
| parent | 41607a1c79824d2058c66fa71894ec181503c391 (diff) | |
| parent | 4340e4fe836d525ce30cd0a884400b77222a1848 (diff) | |
Merge remote-tracking branch 'github/pr/1467' into python3
| -rwxr-xr-x | gr-qtgui/python/qtgui/range.py.cmakein | 4 | ||||
| -rw-r--r-- | grc/core/Param.py | 3 | ||||
| -rw-r--r-- | grc/core/generator/flow_graph.py.mako | 12 | ||||
| -rw-r--r-- | grc/core/generator/top_block.py | 3 |
4 files changed, 17 insertions, 5 deletions
diff --git a/gr-qtgui/python/qtgui/range.py.cmakein b/gr-qtgui/python/qtgui/range.py.cmakein index 9ed7706195..70d0045383 100755 --- a/gr-qtgui/python/qtgui/range.py.cmakein +++ b/gr-qtgui/python/qtgui/range.py.cmakein @@ -22,7 +22,7 @@ # @PY_QT_IMPORT@ -import util +from .util import check_set_qss class Range(object): def __init__(self, minv, maxv, step, default, min_length): @@ -33,7 +33,7 @@ class Range(object): self.min_length = min_length self.find_precision() self.find_nsteps() - util.check_set_qss() + check_set_qss() def find_precision(self): # Get the decimal part of the step diff --git a/grc/core/Param.py b/grc/core/Param.py index a1e4c782fb..56855908ea 100644 --- a/grc/core/Param.py +++ b/grc/core/Param.py @@ -408,3 +408,6 @@ class Param(Element): return '(%s)' % v else: return v + + def get_opt(self, item): + return self.options.attributes[self.get_value()][item] diff --git a/grc/core/generator/flow_graph.py.mako b/grc/core/generator/flow_graph.py.mako index 484441f00f..60b1f40569 100644 --- a/grc/core/generator/flow_graph.py.mako +++ b/grc/core/generator/flow_graph.py.mako @@ -1,5 +1,13 @@ % if not generate_options.startswith('hb'): +<% +from sys import version_info +python_version = version_info.major +%>\ +% if python_version == 2: #!/usr/bin/env python2 +% elif python_version == 3: +#!/usr/bin/env python3 +% endif % endif # -*- coding: utf-8 -*- <%def name="indent(code)">${ '\n '.join(str(code).splitlines()) }</%def> @@ -27,7 +35,7 @@ if __name__ == '__main__': x11 = ctypes.cdll.LoadLibrary('libX11.so') x11.XInitThreads() except: - print "Warning: failed to XInitThreads()" + print("Warning: failed to XInitThreads()") % endif ######################################################## @@ -333,7 +341,7 @@ def main(top_block_cls=${class_name}, options=None): (tb.${m.name}).start() % endfor try: - raw_input('Press Enter to quit: ') + input('Press Enter to quit: ') except EOFError: pass tb.stop() diff --git a/grc/core/generator/top_block.py b/grc/core/generator/top_block.py index 0b18bc837c..d6a7e35575 100644 --- a/grc/core/generator/top_block.py +++ b/grc/core/generator/top_block.py @@ -4,6 +4,7 @@ import os import tempfile import textwrap import time +import re from mako.template import Template @@ -227,7 +228,7 @@ class TopBlockGenerator(object): key = port.key if not key.isdigit(): - key = repr(key) + key = re.findall(r'\d+', key)[0] return '({block}, {key})'.format(block=block, key=key) |