From e5e29a8fef7ba2396015918545a49e717fe75d15 Mon Sep 17 00:00:00 2001
From: Dean Troyer <dtroyer@gmail.com>
Date: Fri, 13 May 2016 16:14:09 -0500
Subject: osc-lib: utils

Use osc-lib directly for utils.

Leave openstackclient.common.utils for deprecation period.

Change-Id: I5bd9579abc4e07f45219ccd0565626e6667472f7
---
 openstackclient/identity/v2_0/catalog.py  | 2 +-
 openstackclient/identity/v2_0/ec2creds.py | 2 +-
 openstackclient/identity/v2_0/endpoint.py | 2 +-
 openstackclient/identity/v2_0/project.py  | 5 ++---
 openstackclient/identity/v2_0/role.py     | 2 +-
 openstackclient/identity/v2_0/service.py  | 2 +-
 openstackclient/identity/v2_0/user.py     | 5 ++---
 7 files changed, 9 insertions(+), 11 deletions(-)

(limited to 'openstackclient/identity/v2_0')

diff --git a/openstackclient/identity/v2_0/catalog.py b/openstackclient/identity/v2_0/catalog.py
index 3210df76..2de1e8e7 100644
--- a/openstackclient/identity/v2_0/catalog.py
+++ b/openstackclient/identity/v2_0/catalog.py
@@ -14,10 +14,10 @@
 """Identity v2 Service Catalog action implementations"""
 
 from osc_lib import exceptions
+from osc_lib import utils
 import six
 
 from openstackclient.common import command
-from openstackclient.common import utils
 from openstackclient.i18n import _
 
 
diff --git a/openstackclient/identity/v2_0/ec2creds.py b/openstackclient/identity/v2_0/ec2creds.py
index dfd67591..86f07bce 100644
--- a/openstackclient/identity/v2_0/ec2creds.py
+++ b/openstackclient/identity/v2_0/ec2creds.py
@@ -16,10 +16,10 @@
 
 """Identity v2 EC2 Credentials action implementations"""
 
+from osc_lib import utils
 import six
 
 from openstackclient.common import command
-from openstackclient.common import utils
 from openstackclient.i18n import _
 
 
diff --git a/openstackclient/identity/v2_0/endpoint.py b/openstackclient/identity/v2_0/endpoint.py
index 09ea738f..89c8a38b 100644
--- a/openstackclient/identity/v2_0/endpoint.py
+++ b/openstackclient/identity/v2_0/endpoint.py
@@ -15,10 +15,10 @@
 
 """Endpoint action implementations"""
 
+from osc_lib import utils
 import six
 
 from openstackclient.common import command
-from openstackclient.common import utils
 from openstackclient.i18n import _
 from openstackclient.identity import common
 
diff --git a/openstackclient/identity/v2_0/project.py b/openstackclient/identity/v2_0/project.py
index 80f88d73..688849fa 100644
--- a/openstackclient/identity/v2_0/project.py
+++ b/openstackclient/identity/v2_0/project.py
@@ -15,13 +15,12 @@
 
 """Identity v2 Project action implementations"""
 
-import six
-
 from keystoneauth1 import exceptions as ks_exc
+from osc_lib import utils
+import six
 
 from openstackclient.common import command
 from openstackclient.common import parseractions
-from openstackclient.common import utils
 from openstackclient.i18n import _
 
 
diff --git a/openstackclient/identity/v2_0/role.py b/openstackclient/identity/v2_0/role.py
index 8914abfd..075234fc 100644
--- a/openstackclient/identity/v2_0/role.py
+++ b/openstackclient/identity/v2_0/role.py
@@ -17,10 +17,10 @@
 
 from keystoneauth1 import exceptions as ks_exc
 from osc_lib import exceptions
+from osc_lib import utils
 import six
 
 from openstackclient.common import command
-from openstackclient.common import utils
 from openstackclient.i18n import _
 
 
diff --git a/openstackclient/identity/v2_0/service.py b/openstackclient/identity/v2_0/service.py
index 1293afc7..631b8737 100644
--- a/openstackclient/identity/v2_0/service.py
+++ b/openstackclient/identity/v2_0/service.py
@@ -18,10 +18,10 @@
 import argparse
 
 from osc_lib import exceptions
+from osc_lib import utils
 import six
 
 from openstackclient.common import command
-from openstackclient.common import utils
 from openstackclient.i18n import _
 from openstackclient.identity import common
 
diff --git a/openstackclient/identity/v2_0/user.py b/openstackclient/identity/v2_0/user.py
index f8f5df29..a10d213b 100644
--- a/openstackclient/identity/v2_0/user.py
+++ b/openstackclient/identity/v2_0/user.py
@@ -15,12 +15,11 @@
 
 """Identity v2.0 User action implementations"""
 
-import six
-
 from keystoneauth1 import exceptions as ks_exc
+from osc_lib import utils
+import six
 
 from openstackclient.common import command
-from openstackclient.common import utils
 from openstackclient.i18n import _
 
 
-- 
cgit v1.2.1