diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-01-30 11:11:31 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-01-30 11:11:31 +0000 |
| commit | 7439c45e461112187c01c1ac99ccc8187292b68f (patch) | |
| tree | 98b7051f40ce1c9ee1504f660261c402a8c361a3 /keystoneclient/generic | |
| parent | 082050c5808bed18bfe56080ed3032fe77a6e5c7 (diff) | |
| parent | 252b6e423d5303402a84f69b7e2e1e629dd171df (diff) | |
| download | python-keystoneclient-7439c45e461112187c01c1ac99ccc8187292b68f.tar.gz | |
Merge "Adjust import items according to hacking import rule"
Diffstat (limited to 'keystoneclient/generic')
| -rw-r--r-- | keystoneclient/generic/client.py | 2 | ||||
| -rw-r--r-- | keystoneclient/generic/shell.py | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/keystoneclient/generic/client.py b/keystoneclient/generic/client.py index 58bc52d..ebaa619 100644 --- a/keystoneclient/generic/client.py +++ b/keystoneclient/generic/client.py @@ -16,11 +16,13 @@ # under the License. import logging + from six.moves.urllib import parse as urlparse from keystoneclient import exceptions from keystoneclient import httpclient + _logger = logging.getLogger(__name__) diff --git a/keystoneclient/generic/shell.py b/keystoneclient/generic/shell.py index 2440821..c8cf352 100644 --- a/keystoneclient/generic/shell.py +++ b/keystoneclient/generic/shell.py @@ -15,10 +15,11 @@ # License for the specific language governing permissions and limitations # under the License. +import six + from keystoneclient.generic import client from keystoneclient import utils -import six CLIENT_CLASS = client.Client |