diff options
author | Jenkins <jenkins@review.openstack.org> | 2016-02-12 03:42:15 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2016-02-12 03:42:15 +0000 |
commit | 80039aaf580da835af74e77dfa7a4d131585c40d (patch) | |
tree | fc6fb5e849644573f60d08ad0d0284bebbafd50e | |
parent | 6832bf234955a707e1b62f9a283ed7f6c78c27d8 (diff) | |
parent | 2d7fa423ff5f5bdf0d6adce183ac903eed6a5d98 (diff) | |
download | python-keystoneclient-80039aaf580da835af74e77dfa7a4d131585c40d.tar.gz |
Merge "Deprecate adapter"
-rw-r--r-- | keystoneclient/adapter.py | 7 | ||||
-rw-r--r-- | keystoneclient/httpclient.py | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/keystoneclient/adapter.py b/keystoneclient/adapter.py index d371e9a..17561a4 100644 --- a/keystoneclient/adapter.py +++ b/keystoneclient/adapter.py @@ -10,6 +10,8 @@ # License for the specific language governing permissions and limitations # under the License. +import warnings + from oslo_serialization import jsonutils from positional import positional @@ -49,6 +51,11 @@ class Adapter(object): interface=None, region_name=None, endpoint_override=None, version=None, auth=None, user_agent=None, connect_retries=None, logger=None): + warnings.warn( + 'keystoneclient.adapter.Adapter is deprecated as of the 2.1.0 ' + 'release in favor of keystoneauth1.adapter.Adapter. It will be ' + 'removed in future releases.', DeprecationWarning) + # NOTE(jamielennox): when adding new parameters to adapter please also # add them to the adapter call in httpclient.HTTPClient.__init__ self.session = session 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 |