diff options
| author | Andrej Rode <mail@andrejro.de> | 2018-06-23 23:41:42 +0200 |
|---|---|---|
| committer | Andrej Rode <mail@andrejro.de> | 2018-06-24 00:03:35 +0200 |
| commit | 167a6152bad060fc53dd29e0fa79ef83eff1be5b (patch) | |
| tree | a01049672d9d7d1bf3d295ed96698a323941f8e8 /gnuradio-runtime/python/gnuradio/gr/gateway.py | |
| parent | 3c8e6008b092287246234001db7cf1a4038300da (diff) | |
| parent | fcd002b6ac82e1e0c1224e24506410ff0833e1aa (diff) | |
Merge branch 'python3_fix' into next
Manual merge conflict resolution has been applied to following
conflicts:
* Typos:
* gnuradio-runtime/python/gnuradio/ctrlport/GrDataPlotter.py
* gr-blocks/python/blocks/qa_wavfile.py
* gr-filter/examples/gr_filtdes_api.py
* grc/blocks/parameter.xml
* gr-uhd/python/uhd/__init__.py
* ValueError -> RuntimeError:
* gr-blocks/python/blocks/qa_hier_block2.py
* relative Imports & other Py3k:
* gr-digital/python/digital/psk_constellations.py
* gr-digital/python/digital/qam_constellations.py
* gr-digital/python/digital/test_soft_decisions.py
* gr-digital/python/digital/gfsk.py
* SequenceCompleter:
* gr-utils/python/modtool/modtool_add.py
* gr-utils/python/modtool/modtool_rename.py
* gr-utils/python/modtool/modtool_rm.py
* Updated API on next:
* gr-blocks/grc/blocks_file_source.xml
* gr-blocks/python/blocks/qa_file_source_sink.py
* gr-qtgui/grc/qtgui_time_sink_x.xml
* GRC Py3k Updates:
* grc/core/Block.py
* grc/core/Constants.py
* grc/core/Platform.py
* grc/core/utils/odict.py
* grc/gui/Actions.py
* grc/gui/Block.py
* grc/gui/Executor.py
* grc/gui/Port.py
Diffstat (limited to 'gnuradio-runtime/python/gnuradio/gr/gateway.py')
| -rw-r--r-- | gnuradio-runtime/python/gnuradio/gr/gateway.py | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/gnuradio-runtime/python/gnuradio/gr/gateway.py b/gnuradio-runtime/python/gnuradio/gr/gateway.py index 8403421dd5..1acf900f84 100644 --- a/gnuradio-runtime/python/gnuradio/gr/gateway.py +++ b/gnuradio-runtime/python/gnuradio/gr/gateway.py @@ -19,18 +19,23 @@ # Boston, MA 02110-1301, USA. # -import runtime_swig as gr -from runtime_swig import io_signature, io_signaturev -from runtime_swig import block_gw_message_type -from runtime_swig import block_gateway +from __future__ import print_function +from __future__ import unicode_literals + + import numpy +from . import runtime_swig as gr +from .runtime_swig import io_signature, io_signaturev +from .runtime_swig import block_gw_message_type +from .runtime_swig import block_gateway + ######################################################################## # Magic to turn pointers into numpy arrays # http://docs.scipy.org/doc/numpy/reference/arrays.interface.html ######################################################################## def pointer_to_ndarray(addr, dtype, nitems): - class array_like: + class array_like(object): __array_interface__ = { 'data' : (int(addr), False), 'typestr' : dtype.base.str, @@ -87,13 +92,13 @@ class gateway_block(object): #ensure that the sigs are iterable dtypes def sig_to_dtype_sig(sig): if sig is None: sig = () - return map(numpy.dtype, sig) + return list(map(numpy.dtype, sig)) self.__in_sig = sig_to_dtype_sig(in_sig) self.__out_sig = sig_to_dtype_sig(out_sig) #cache the ranges to iterate when dispatching work - self.__in_indexes = range(len(self.__in_sig)) - self.__out_indexes = range(len(self.__out_sig)) + self.__in_indexes = list(range(len(self.__in_sig))) + self.__out_indexes = list(range(len(self.__out_sig))) #convert the signatures into gr.io_signatures def sig_to_gr_io_sigv(sig): |