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

1 files changed, 9 insertions, 4 deletions

diff --git a/keystoneclient/common/cms.py b/keystoneclient/common/cms.py
index 68af1dd..c5b35da 100644
--- a/keystoneclient/common/cms.py
+++ b/keystoneclient/common/cms.py
@@ -26,10 +26,11 @@ import logging
 import textwrap
 import zlib
 
+from debtcollector import removals
 import six
 
 from keystoneclient import exceptions
-from keystoneclient.i18n import _, _LE, _LW
+from keystoneclient.i18n import _, _LE
 
 
 subprocess = None
@@ -297,10 +298,14 @@ def is_asn1_token(token):
     return token[:3] == PKI_ASN1_PREFIX
 
 
+@removals.remove(message='Use is_asn1_token() instead.', version='1.7.0',
+                 removal_version='2.0.0')
 def is_ans1_token(token):
-    """Deprecated. Use is_asn1_token() instead."""
-    LOG.warning(_LW('The function is_ans1_token() is deprecated, '
-                    'use is_asn1_token() instead.'))
+    """Deprecated.
+
+    This function is deprecated as of the 1.7.0 release in favor of
+    :func:`is_asn1_token` and may be removed in the 2.0.0 release.
+    """
     return is_asn1_token(token)