summaryrefslogtreecommitdiff
path: root/keystoneclient/httpclient.py
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-02-12 03:42:15 +0000
committerGerrit Code Review <review@openstack.org>2016-02-12 03:42:15 +0000
commit80039aaf580da835af74e77dfa7a4d131585c40d (patch)
treefc6fb5e849644573f60d08ad0d0284bebbafd50e /keystoneclient/httpclient.py
parent6832bf234955a707e1b62f9a283ed7f6c78c27d8 (diff)
parent2d7fa423ff5f5bdf0d6adce183ac903eed6a5d98 (diff)
downloadpython-keystoneclient-80039aaf580da835af74e77dfa7a4d131585c40d.tar.gz
Merge "Deprecate adapter"
Diffstat (limited to 'keystoneclient/httpclient.py')
-rw-r--r--keystoneclient/httpclient.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/keystoneclient/httpclient.py b/keystoneclient/httpclient.py
index 1e4f48f..d6e0926 100644
--- a/keystoneclient/httpclient.py
+++ b/keystoneclient/httpclient.py
@@ -24,6 +24,7 @@ import warnings
from debtcollector import removals
from debtcollector import renames
+from keystoneauth1 import adapter
from oslo_serialization import jsonutils
import pkg_resources
from positional import positional
@@ -52,7 +53,6 @@ except (ImportError, pkg_resources.DistributionNotFound):
from keystoneclient import _discover
from keystoneclient import access
-from keystoneclient import adapter
from keystoneclient.auth import base
from keystoneclient import baseclient
from keystoneclient import exceptions