Michael Pasternak has uploaded a new change for review. Change subject: cli: cleanup ......................................................................
cli: cleanup Change-Id: Ia26a327492c4b45f6fba4ade55abb8bb821c21e5 Signed-off-by: Michael pasternak <[email protected]> --- M src/cli/messages.py M src/cli/settings.py M src/ovirtcli/command/help.py M src/ovirtcli/command/ping.py A src/ovirtcli/infrastructure/__init__.py R src/ovirtcli/infrastructure/context.py R src/ovirtcli/infrastructure/historymanager.py R src/ovirtcli/infrastructure/object.py R src/ovirtcli/infrastructure/options.py R src/ovirtcli/infrastructure/settings.py M src/ovirtcli/main.py M src/ovirtcli/shell/cmdshell.py M src/ovirtcli/shell/connectcmdshell.py M src/ovirtcli/shell/engineshell.py M src/ovirtcli/shell/promptmanager.py R src/ovirtcli/shell/promptmode.py 16 files changed, 20 insertions(+), 19 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine-cli refs/changes/77/20577/1 diff --git a/src/cli/messages.py b/src/cli/messages.py index 8da51de..c4d0f9a 100644 --- a/src/cli/messages.py +++ b/src/cli/messages.py @@ -13,7 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from ovirtcli.settings import OvirtCliSettings + + +from ovirtcli.infrastructure.settings import OvirtCliSettings class Messages(): class Error(): diff --git a/src/cli/settings.py b/src/cli/settings.py index d3e633b..4bab8c5 100644 --- a/src/cli/settings.py +++ b/src/cli/settings.py @@ -124,7 +124,7 @@ """ old_format = False fname = platform.local_settings_file(self.name) - from ovirtcli.settings import OvirtCliSettings + from ovirtcli.infrastructure.settings import OvirtCliSettings if fname is None: return False, old_format cp = ConfigParser() @@ -151,7 +151,7 @@ ftmp = '%s.%d-tmp' % (fname, os.getpid()) fout = file(ftmp, 'w') sections = {} - from ovirtcli.settings import OvirtCliSettings + from ovirtcli.infrastructure.settings import OvirtCliSettings for key in settings: if key in OvirtCliSettings.config_items: section, name = key.split(':') diff --git a/src/ovirtcli/command/help.py b/src/ovirtcli/command/help.py index 9f7d94c..a5af3ca 100644 --- a/src/ovirtcli/command/help.py +++ b/src/ovirtcli/command/help.py @@ -16,7 +16,7 @@ from ovirtcli.command.command import OvirtCommand -from ovirtcli.settings import OvirtCliSettings +from ovirtcli.infrastructure.settings import OvirtCliSettings from ovirtcli.shell.engineshell import EngineShell diff --git a/src/ovirtcli/command/ping.py b/src/ovirtcli/command/ping.py index f30ccc9..752b183 100644 --- a/src/ovirtcli/command/ping.py +++ b/src/ovirtcli/command/ping.py @@ -16,7 +16,7 @@ from ovirtcli.command.command import OvirtCommand -from ovirtcli.settings import OvirtCliSettings +from ovirtcli.infrastructure.settings import OvirtCliSettings from cli.messages import Messages diff --git a/src/ovirtcli/infrastructure/__init__.py b/src/ovirtcli/infrastructure/__init__.py new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/src/ovirtcli/infrastructure/__init__.py diff --git a/src/ovirtcli/context.py b/src/ovirtcli/infrastructure/context.py similarity index 96% rename from src/ovirtcli/context.py rename to src/ovirtcli/infrastructure/context.py index 1fe45ed..6e34820 100644 --- a/src/ovirtcli/context.py +++ b/src/ovirtcli/infrastructure/context.py @@ -18,16 +18,16 @@ from cli.command import * from cli.context import ExecutionContext -from ovirtcli.settings import OvirtCliSettings +from ovirtcli.infrastructure.settings import OvirtCliSettings from ovirtcli.command import * from ovirtcli.format import * -from ovirtcli.object import create +from ovirtcli.infrastructure.object import create import pkg_resources from ovirtcli.command.info import InfoCommand -from ovirtcli.historymanager import HistoryManager from ovirtcli.command.summary import SummaryCommand from ovirtcli.command.capabilities import CapabilitiesCommand +from ovirtcli.infrastructure.historymanager import HistoryManager class OvirtCliExecutionContext(ExecutionContext): diff --git a/src/ovirtcli/historymanager.py b/src/ovirtcli/infrastructure/historymanager.py similarity index 95% rename from src/ovirtcli/historymanager.py rename to src/ovirtcli/infrastructure/historymanager.py index 5c49d6e..9bbd54a 100644 --- a/src/ovirtcli/historymanager.py +++ b/src/ovirtcli/infrastructure/historymanager.py @@ -18,7 +18,7 @@ import readline import atexit import os -from ovirtcli.settings import OvirtCliSettings +from ovirtcli.infrastructure.settings import OvirtCliSettings import threading HISTORY_METAFILE = "~/." + OvirtCliSettings.PRODUCT.lower() + "shellhistory" @@ -28,7 +28,7 @@ """ Provides history management capabilities """ def __init__(self, - locals=None, + locals=None, # @ReservedAssignment filename="<console>", histfile=os.path.expanduser(HISTORY_METAFILE), temp_histfile=os.path.expanduser(TMP_HISTORY_METAFILE), diff --git a/src/ovirtcli/object.py b/src/ovirtcli/infrastructure/object.py similarity index 100% rename from src/ovirtcli/object.py rename to src/ovirtcli/infrastructure/object.py diff --git a/src/ovirtcli/options.py b/src/ovirtcli/infrastructure/options.py similarity index 98% rename from src/ovirtcli/options.py rename to src/ovirtcli/infrastructure/options.py index ab41119..4474088 100644 --- a/src/ovirtcli/options.py +++ b/src/ovirtcli/infrastructure/options.py @@ -18,7 +18,7 @@ import sys import textwrap from optparse import OptionParser, BadOptionError, AmbiguousOptionError -from ovirtcli import settings +from ovirtcli.infrastructure import settings class OvirtCliOptionParser(OptionParser): diff --git a/src/ovirtcli/settings.py b/src/ovirtcli/infrastructure/settings.py similarity index 100% rename from src/ovirtcli/settings.py rename to src/ovirtcli/infrastructure/settings.py diff --git a/src/ovirtcli/main.py b/src/ovirtcli/main.py index 7df4e7f..20aac92 100644 --- a/src/ovirtcli/main.py +++ b/src/ovirtcli/main.py @@ -16,9 +16,9 @@ import sys -from ovirtcli.options import OvirtCliOptionParser -from ovirtcli.context import OvirtCliExecutionContext -from ovirtcli.object import create +from ovirtcli.infrastructure.options import OvirtCliOptionParser +from ovirtcli.infrastructure.context import OvirtCliExecutionContext +from ovirtcli.infrastructure.object import create from ovirtcli.shell.engineshell import EngineShell ############################## MAIN ################################# diff --git a/src/ovirtcli/shell/cmdshell.py b/src/ovirtcli/shell/cmdshell.py index 5a21781..794c700 100644 --- a/src/ovirtcli/shell/cmdshell.py +++ b/src/ovirtcli/shell/cmdshell.py @@ -19,7 +19,7 @@ import itertools from ovirtcli.utils.typehelper import TypeHelper -from ovirtcli.settings import OvirtCliSettings +from ovirtcli.infrastructure.settings import OvirtCliSettings class CmdShell(object): diff --git a/src/ovirtcli/shell/connectcmdshell.py b/src/ovirtcli/shell/connectcmdshell.py index fed874b..443cf1a 100644 --- a/src/ovirtcli/shell/connectcmdshell.py +++ b/src/ovirtcli/shell/connectcmdshell.py @@ -20,7 +20,6 @@ from ovirtcli.shell.cmdshell import CmdShell from ovirtcli.utils.autocompletionhelper import AutoCompletionHelper -from ovirtcli.prompt import PromptMode class ConnectCmdShell(CmdShell): NAME = 'connect' diff --git a/src/ovirtcli/shell/engineshell.py b/src/ovirtcli/shell/engineshell.py index e8a80d6..5772994 100644 --- a/src/ovirtcli/shell/engineshell.py +++ b/src/ovirtcli/shell/engineshell.py @@ -45,8 +45,8 @@ from ovirtcli.events.event import Event from ovirtcli.listeners.errorlistener import ErrorListener -from ovirtcli.settings import OvirtCliSettings -from ovirtcli.prompt import PromptMode +from ovirtcli.infrastructure.settings import OvirtCliSettings +from ovirtcli.shell.promptmode import PromptMode from cli.error import CommandError from ovirtcli.state.statemachine import StateMachine diff --git a/src/ovirtcli/shell/promptmanager.py b/src/ovirtcli/shell/promptmanager.py index 6c004a1..7d084d6 100644 --- a/src/ovirtcli/shell/promptmanager.py +++ b/src/ovirtcli/shell/promptmanager.py @@ -16,7 +16,7 @@ from ovirtcli.utils.colorhelper import ColorHelper from cli.executionmode import ExecutionMode import urlparse -from ovirtcli.prompt import PromptMode +from ovirtcli.shell.promptmode import PromptMode class PromptManager(object): diff --git a/src/ovirtcli/prompt.py b/src/ovirtcli/shell/promptmode.py similarity index 100% rename from src/ovirtcli/prompt.py rename to src/ovirtcli/shell/promptmode.py -- To view, visit http://gerrit.ovirt.org/20577 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia26a327492c4b45f6fba4ade55abb8bb821c21e5 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine-cli Gerrit-Branch: master Gerrit-Owner: Michael Pasternak <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
