From 8b00b8459a6b6bc7a43ee64648a115abf4abe591 Mon Sep 17 00:00:00 2001 From: Max Date: Sun, 23 Feb 2020 21:08:04 -0500 Subject: [PATCH] additional python 2/3 agnosticism --- op25/gr-op25/python/__init__.py | 6 +++--- op25/gr-op25_repeater/python/__init__.py | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/op25/gr-op25/python/__init__.py b/op25/gr-op25/python/__init__.py index f9ce6d5..7338b06 100644 --- a/op25/gr-op25/python/__init__.py +++ b/op25/gr-op25/python/__init__.py @@ -31,9 +31,9 @@ try: from dl import RTLD_GLOBAL as _RTLD_GLOBAL except ImportError: try: - from DLFCN import RTLD_GLOBAL as _RTLD_GLOBAL + from DLFCN import RTLD_GLOBAL as _RTLD_GLOBAL except ImportError: - pass + pass if _RTLD_GLOBAL != 0: _dlopenflags = sys.getdlopenflags() @@ -42,7 +42,7 @@ if _RTLD_GLOBAL != 0: # import swig generated symbols into the op25 namespace -from op25_swig import * +from .op25_swig import * # import any pure python here # diff --git a/op25/gr-op25_repeater/python/__init__.py b/op25/gr-op25_repeater/python/__init__.py index 4628ad6..bbbc45a 100644 --- a/op25/gr-op25_repeater/python/__init__.py +++ b/op25/gr-op25_repeater/python/__init__.py @@ -31,9 +31,9 @@ try: from dl import RTLD_GLOBAL as _RTLD_GLOBAL except ImportError: try: - from DLFCN import RTLD_GLOBAL as _RTLD_GLOBAL + from DLFCN import RTLD_GLOBAL as _RTLD_GLOBAL except ImportError: - pass + pass if _RTLD_GLOBAL != 0: _dlopenflags = sys.getdlopenflags() @@ -42,7 +42,7 @@ if _RTLD_GLOBAL != 0: # import swig generated symbols into the op25_repeater namespace -from op25_repeater_swig import * +from .op25_repeater_swig import * # import any pure python here #