diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-06-14 04:22:03 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-06-14 04:22:03 +0000 |
| commit | 287fe3610af6297b654dc30ee587aa0f7eecaeaa (patch) | |
| tree | 6b91a34be273f921f59e8032ae8bb2ca546c8d20 /openstackclient/image | |
| parent | 5c402c1da23cde8b566e406b4e56bd2be2e1a729 (diff) | |
| parent | be192676bd2f2beeea0ec4265d5f78a8cf9af637 (diff) | |
| download | python-openstackclient-287fe3610af6297b654dc30ee587aa0f7eecaeaa.tar.gz | |
Merge "osc-lib: parseractions"
Diffstat (limited to 'openstackclient/image')
| -rw-r--r-- | openstackclient/image/v1/image.py | 4 | ||||
| -rw-r--r-- | openstackclient/image/v2/image.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/openstackclient/image/v1/image.py b/openstackclient/image/v1/image.py index 73fbe290..f137f262 100644 --- a/openstackclient/image/v1/image.py +++ b/openstackclient/image/v1/image.py @@ -18,7 +18,6 @@ import argparse import io import os -import six import sys if os.name == "nt": @@ -27,11 +26,12 @@ else: msvcrt = None from glanceclient.common import utils as gc_utils +from osc_lib.cli import parseractions from osc_lib import utils +import six from openstackclient.api import utils as api_utils from openstackclient.common import command -from openstackclient.common import parseractions from openstackclient.i18n import _ diff --git a/openstackclient/image/v2/image.py b/openstackclient/image/v2/image.py index 668e4ed9..7d663a6c 100644 --- a/openstackclient/image/v2/image.py +++ b/openstackclient/image/v2/image.py @@ -18,13 +18,13 @@ import argparse from glanceclient.common import utils as gc_utils +from osc_lib.cli import parseractions from osc_lib import exceptions from osc_lib import utils import six from openstackclient.api import utils as api_utils from openstackclient.common import command -from openstackclient.common import parseractions from openstackclient.i18n import _ from openstackclient.identity import common |