diff options
| author | Marcus Müller <marcus@hostalia.de> | 2018-08-31 23:02:22 +0200 |
|---|---|---|
| committer | Marcus Müller <marcus@hostalia.de> | 2018-08-31 23:02:22 +0200 |
| commit | 254fe5e89403d4de1fa6663d09efdf946996aff3 (patch) | |
| tree | 62877d7ac7fdedf6c397c51e22ac6f97eba97ddf /gnuradio-runtime/python/gnuradio/gr/gr_threading.py | |
| parent | 896d1c9da31963ecf5b0d90942c2af51ca998a69 (diff) | |
| parent | 5ad935c3a3dd46ce2860b13e2b774e4841784616 (diff) | |
Merge remote-tracking branch 'origin/next' into merge_next
Diffstat (limited to 'gnuradio-runtime/python/gnuradio/gr/gr_threading.py')
| -rw-r--r-- | gnuradio-runtime/python/gnuradio/gr/gr_threading.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/gnuradio-runtime/python/gnuradio/gr/gr_threading.py b/gnuradio-runtime/python/gnuradio/gr/gr_threading.py index 5d6f0fdaf9..cb0519f6f6 100644 --- a/gnuradio-runtime/python/gnuradio/gr/gr_threading.py +++ b/gnuradio-runtime/python/gnuradio/gr/gr_threading.py @@ -1,3 +1,5 @@ +from __future__ import absolute_import +from __future__ import unicode_literals # # Copyright 2005 Free Software Foundation, Inc. # @@ -25,10 +27,10 @@ from sys import version_info as _version_info if _version_info[0:2] == (2, 3): #print "Importing gr_threading_23" - from gr_threading_23 import * + from .gr_threading_23 import * elif _version_info[0:2] == (2, 4): #print "Importing gr_threading_24" - from gr_threading_24 import * + from .gr_threading_24 import * else: # assume the patch was applied... #print "Importing system provided threading" |