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 /gr-utils/python/modtool/__init__.py | |
parent | 896d1c9da31963ecf5b0d90942c2af51ca998a69 (diff) | |
parent | 5ad935c3a3dd46ce2860b13e2b774e4841784616 (diff) |
Merge remote-tracking branch 'origin/next' into merge_next
Diffstat (limited to 'gr-utils/python/modtool/__init__.py')
-rw-r--r-- | gr-utils/python/modtool/__init__.py | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/gr-utils/python/modtool/__init__.py b/gr-utils/python/modtool/__init__.py index 0319b91326..b6d719ac1d 100644 --- a/gr-utils/python/modtool/__init__.py +++ b/gr-utils/python/modtool/__init__.py @@ -1,5 +1,7 @@ +from __future__ import absolute_import +from __future__ import unicode_literals # -# Copyright 2013 Free Software Foundation, Inc. +# Copyright 2013-2014 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -19,19 +21,17 @@ # Boston, MA 02110-1301, USA. # -from cmakefile_editor import CMakeFileEditor -from code_generator import GRMTemplate -from grc_xml_generator import GRCXMLGenerator -from modtool_base import ModTool, ModToolException, get_class_dict -from modtool_add import ModToolAdd -from modtool_disable import ModToolDisable -from modtool_info import ModToolInfo -from modtool_makexml import ModToolMakeXML -from modtool_newmod import ModToolNewModule -from modtool_rm import ModToolRemove -from modtool_rename import ModToolRename -from templates import Templates +from .cmakefile_editor import CMakeFileEditor +from .grc_xml_generator import GRCXMLGenerator +from .modtool_base import ModTool, ModToolException, get_modtool_modules +from .modtool_add import ModToolAdd +from .modtool_disable import ModToolDisable +from .modtool_info import ModToolInfo +from .modtool_makexml import ModToolMakeXML +from .modtool_newmod import ModToolNewModule +from .modtool_rm import ModToolRemove +from .modtool_rename import ModToolRename +from .templates import Templates # Leave this at the end -from modtool_help import ModToolHelp -from parser_cc_block import ParserCCBlock -from util_functions import * +from .parser_cc_block import ParserCCBlock +from .util_functions import * |