diff options
| author | Brant Knudson <bknudson@us.ibm.com> | 2015-08-06 09:37:43 -0500 |
|---|---|---|
| committer | Brant Knudson <bknudson@us.ibm.com> | 2015-08-06 09:37:43 -0500 |
| commit | 4e498a54d0034b2ce5c87130f080ff580d241600 (patch) | |
| tree | d21d11091373e80bf1a4f70ecf1ee54ff82e0ff8 /keystoneclient/apiclient/exceptions.py | |
| parent | d5c5423d6de3710e3480e47062333b33e8de0713 (diff) | |
| parent | eae8e83f5a7a170b98ef2d74a4ffd9eac7cc47ba (diff) | |
| download | python-keystoneclient-feature/keystoneauth_integration.tar.gz | |
Merge remote-tracking branch 'origin/master' into merge-branchfeature/keystoneauth_integration
Conflicts:
keystoneclient/exceptions.py
keystoneclient/fixture/discovery.py
keystoneclient/fixture/v2.py
keystoneclient/fixture/v3.py
keystoneclient/middleware/auth_token.py
keystoneclient/middleware/s3_token.py
keystoneclient/tests/unit/test_auth_token_middleware.py
keystoneclient/tests/unit/test_memcache_crypt.py
keystoneclient/tests/unit/test_s3_token_middleware.py
requirements.txt
test-requirements.txt
Change-Id: Ib51acebaac7966bf37c1562fa15b9061df6a7aa5
Diffstat (limited to 'keystoneclient/apiclient/exceptions.py')
| -rw-r--r-- | keystoneclient/apiclient/exceptions.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/keystoneclient/apiclient/exceptions.py b/keystoneclient/apiclient/exceptions.py index 9828208..99d9ec2 100644 --- a/keystoneclient/apiclient/exceptions.py +++ b/keystoneclient/apiclient/exceptions.py @@ -20,14 +20,15 @@ Exception definitions. Deprecated since v0.7.1. Use 'keystoneclient.exceptions' instead of -this module. +this module. This module may be removed in the 2.0.0 release. """ -import warnings +from debtcollector import removals from keystoneclient.exceptions import * # noqa -warnings.warn("The 'keystoneclient.apiclient.exceptions' module is deprecated " - "since v.0.7.1. Use 'keystoneclient.exceptions' instead of this " - "module.", DeprecationWarning) +removals.removed_module('keystoneclient.apiclient.exceptions', + replacement='keystoneclient.exceptions', + version='0.7.1', + removal_version='2.0') |