diff options
author | Ben Reynwar <ben@reynwar.net> | 2013-03-08 20:05:52 -0700 |
---|---|---|
committer | Ben Reynwar <ben@reynwar.net> | 2013-03-08 20:05:52 -0700 |
commit | 86b12479d5179645e0d7b0367dbae2bf531bbca8 (patch) | |
tree | d295241405ed320fa7aab86b442848e856a963f1 /gr-trellis/python | |
parent | ae30f247616b6229fb304e30fecf3f82ae09dbf6 (diff) |
trellis: Enabling uninstalled python imports.
Diffstat (limited to 'gr-trellis/python')
-rw-r--r-- | gr-trellis/python/trellis/CMakeLists.txt (renamed from gr-trellis/python/CMakeLists.txt) | 0 | ||||
-rw-r--r-- | gr-trellis/python/trellis/__init__.py (renamed from gr-trellis/python/__init__.py) | 8 | ||||
-rw-r--r-- | gr-trellis/python/trellis/awgn1o2_4.fsm (renamed from gr-trellis/python/awgn1o2_4.fsm) | 0 | ||||
-rwxr-xr-x | gr-trellis/python/trellis/qa_trellis.py (renamed from gr-trellis/python/qa_trellis.py) | 0 |
4 files changed, 7 insertions, 1 deletions
diff --git a/gr-trellis/python/CMakeLists.txt b/gr-trellis/python/trellis/CMakeLists.txt index a166764fbe..a166764fbe 100644 --- a/gr-trellis/python/CMakeLists.txt +++ b/gr-trellis/python/trellis/CMakeLists.txt diff --git a/gr-trellis/python/__init__.py b/gr-trellis/python/trellis/__init__.py index a1792bc9b4..f2540e835f 100644 --- a/gr-trellis/python/__init__.py +++ b/gr-trellis/python/trellis/__init__.py @@ -23,5 +23,11 @@ Blocks and utilities for trellis coding and related. ''' # The presence of this file turns this directory into a Python package +import os -from trellis_swig import * +try: + from trellis_swig import * +except ImportError: + dirname, filename = os.path.split(os.path.abspath(__file__)) + __path__.append(os.path.join(dirname, "..", "..", "swig")) + from trellis_swig import * diff --git a/gr-trellis/python/awgn1o2_4.fsm b/gr-trellis/python/trellis/awgn1o2_4.fsm index 9245c69ac1..9245c69ac1 100644 --- a/gr-trellis/python/awgn1o2_4.fsm +++ b/gr-trellis/python/trellis/awgn1o2_4.fsm diff --git a/gr-trellis/python/qa_trellis.py b/gr-trellis/python/trellis/qa_trellis.py index 983a749af6..983a749af6 100755 --- a/gr-trellis/python/qa_trellis.py +++ b/gr-trellis/python/trellis/qa_trellis.py |