From 016a0b301e0ecfea5d84b09e7f1e22a86953c1c1 Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Tue, 14 May 2013 08:28:48 -0700 Subject: Fix flake8 errors in anticipation of flake8 patch. Change-Id: Ifdc4322b699f2bd91a6900e55695acd3d736568e --- openstackclient/shell.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'openstackclient/shell.py') diff --git a/openstackclient/shell.py b/openstackclient/shell.py index 303771c6..cd5ab552 100644 --- a/openstackclient/shell.py +++ b/openstackclient/shell.py @@ -20,14 +20,14 @@ import logging import os import sys -from cliff.app import App -from cliff.help import HelpAction +from cliff import app +from cliff import help from openstackclient.common import clientmanager +from openstackclient.common.commandmanager import CommandManager from openstackclient.common import exceptions as exc from openstackclient.common import openstackkeyring from openstackclient.common import utils -from openstackclient.common.commandmanager import CommandManager VERSION = '0.1' @@ -53,7 +53,7 @@ def env(*vars, **kwargs): return kwargs.get('default', '') -class OpenStackShell(App): +class OpenStackShell(app.App): CONSOLE_MESSAGE_FORMAT = '%(levelname)s: %(name)s %(message)s' @@ -75,10 +75,10 @@ class OpenStackShell(App): # have been loaded. There doesn't seem to be a # way to edit/remove anything from an existing parser. - # Replace the cliff-added HelpAction to defer its execution + # Replace the cliff-added help.HelpAction to defer its execution self.DeferredHelpAction = None for a in self.parser._actions: - if type(a) == HelpAction: + if type(a) == help.HelpAction: # Found it, save and replace it self.DeferredHelpAction = a @@ -359,7 +359,7 @@ class OpenStackShell(App): def main(argv=sys.argv[1:]): try: return OpenStackShell().run(argv) - except: + except Exception: return 1 -- cgit v1.2.1