From cc087724beed1f6fb1b57033d3d8415368be48be Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Mon, 12 Aug 2013 13:06:25 -0400 Subject: Options: Replace relative imports with absolute --- src/lib/Bcfg2/Options/Actions.py | 2 +- src/lib/Bcfg2/Options/Common.py | 10 ++++------ src/lib/Bcfg2/Options/OptionGroups.py | 2 +- src/lib/Bcfg2/Options/Options.py | 2 +- src/lib/Bcfg2/Options/Parser.py | 2 +- src/lib/Bcfg2/Options/Subcommands.py | 8 +++----- src/lib/Bcfg2/Options/__init__.py | 16 ++++++++-------- 7 files changed, 19 insertions(+), 23 deletions(-) (limited to 'src/lib') diff --git a/src/lib/Bcfg2/Options/Actions.py b/src/lib/Bcfg2/Options/Actions.py index 637a09577..8b97f1da8 100644 --- a/src/lib/Bcfg2/Options/Actions.py +++ b/src/lib/Bcfg2/Options/Actions.py @@ -2,7 +2,7 @@ import sys import argparse -from Parser import get_parser # pylint: disable=W0403 +from Bcfg2.Options.Parser import get_parser __all__ = ["ConfigFileAction", "ComponentAction", "PluginsAction"] diff --git a/src/lib/Bcfg2/Options/Common.py b/src/lib/Bcfg2/Options/Common.py index eb4af5bb6..9ba08eb87 100644 --- a/src/lib/Bcfg2/Options/Common.py +++ b/src/lib/Bcfg2/Options/Common.py @@ -1,12 +1,10 @@ """ Common options used in multiple different contexts. """ from Bcfg2.Utils import classproperty -# pylint: disable=W0403 -import Types -from Actions import PluginsAction, ComponentAction -from Parser import repository as _repository_option -from Options import Option, PathOption, BooleanOption -# pylint: enable=W0403 +from Bcfg2.Options import Types +from Bcfg2.Options.Actions import PluginsAction, ComponentAction +from Bcfg2.Options.Parser import repository as _repository_option +from Bcfg2.Options import Option, PathOption, BooleanOption __all__ = ["Common"] diff --git a/src/lib/Bcfg2/Options/OptionGroups.py b/src/lib/Bcfg2/Options/OptionGroups.py index 70cb5d0dd..465358fab 100644 --- a/src/lib/Bcfg2/Options/OptionGroups.py +++ b/src/lib/Bcfg2/Options/OptionGroups.py @@ -3,7 +3,7 @@ import re import copy import fnmatch -from Options import Option # pylint: disable=W0403 +from Bcfg2.Options import Option from itertools import chain __all__ = ["OptionGroup", "ExclusiveOptionGroup", "Subparser", diff --git a/src/lib/Bcfg2/Options/Options.py b/src/lib/Bcfg2/Options/Options.py index d60c536cf..be7e7c646 100644 --- a/src/lib/Bcfg2/Options/Options.py +++ b/src/lib/Bcfg2/Options/Options.py @@ -4,9 +4,9 @@ need to be associated with an option parser; it exists on its own.""" import os import copy -import Types # pylint: disable=W0403 import fnmatch import argparse +from Bcfg2.Options import Types from Bcfg2.Compat import ConfigParser diff --git a/src/lib/Bcfg2/Options/Parser.py b/src/lib/Bcfg2/Options/Parser.py index dd7874d35..8b56548a9 100644 --- a/src/lib/Bcfg2/Options/Parser.py +++ b/src/lib/Bcfg2/Options/Parser.py @@ -5,7 +5,7 @@ import sys import argparse from Bcfg2.version import __version__ from Bcfg2.Compat import ConfigParser -from Options import Option, PathOption, BooleanOption # pylint: disable=W0403 +from Bcfg2.Options import Option, PathOption, BooleanOption __all__ = ["setup", "OptionParserException", "Parser", "get_parser"] diff --git a/src/lib/Bcfg2/Options/Subcommands.py b/src/lib/Bcfg2/Options/Subcommands.py index 7d7a3f928..660bd5077 100644 --- a/src/lib/Bcfg2/Options/Subcommands.py +++ b/src/lib/Bcfg2/Options/Subcommands.py @@ -8,11 +8,9 @@ import copy import shlex import logging from Bcfg2.Compat import StringIO -# pylint: disable=W0403 -from OptionGroups import Subparser -from Options import PositionalArgument -from Parser import Parser, setup as master_setup -# pylint: enable=W0403 +from Bcfg2.Options import PositionalArgument +from Bcfg2.Options.OptionGroups import Subparser +from Bcfg2.Options.Parser import Parser, setup as master_setup __all__ = ["Subcommand", "HelpCommand", "CommandRegistry", "register_commands"] diff --git a/src/lib/Bcfg2/Options/__init__.py b/src/lib/Bcfg2/Options/__init__.py index 546068f1f..93ab953bf 100644 --- a/src/lib/Bcfg2/Options/__init__.py +++ b/src/lib/Bcfg2/Options/__init__.py @@ -1,10 +1,10 @@ """ Bcfg2 options parsing. """ -# pylint: disable=W0611,W0401,W0403 -import Types -from Common import * -from Parser import * -from Actions import * -from Options import * -from Subcommands import * -from OptionGroups import * +# pylint: disable=W0611 +from Bcfg2.Options import Types +from Bcfg2.Options.Options import * +from Bcfg2.Options.Common import * +from Bcfg2.Options.Parser import * +from Bcfg2.Options.Actions import * +from Bcfg2.Options.Subcommands import * +from Bcfg2.Options.OptionGroups import * -- cgit v1.2.3-1-g7c22