Merge "deprecate XML support in favor of JSON"

1 files changed, 9 insertions, 0 deletions

diff --git a/keystone/middleware/core.py b/keystone/middleware/core.py
index 6569ca1fa..4fa50ac7c 100644
--- a/keystone/middleware/core.py
+++ b/keystone/middleware/core.py
@@ -23,6 +23,7 @@ from keystone.common import wsgi
 from keystone import exception
 from keystone.openstack.common import jsonutils
 from keystone.openstack.common import log
+from keystone.openstack.common import versionutils
 
 CONF = config.CONF
 LOG = log.getLogger(__name__)
@@ -143,6 +144,14 @@ class JsonBodyMiddleware(wsgi.Middleware):
 class XmlBodyMiddleware(wsgi.Middleware):
     """De/serializes XML to/from JSON."""
 
+    @versionutils.deprecated(
+        what='keystone.middleware.core.XmlBodyMiddleware',
+        as_of=versionutils.deprecated.ICEHOUSE,
+        in_favor_of='support for "application/json" only',
+        remove_in=+2)
+    def __init__(self, *args, **kwargs):
+        super(XmlBodyMiddleware, self).__init__(*args, **kwargs)
+
     def process_request(self, request):
         """Transform the request from XML to JSON."""
         incoming_xml = 'application/xml' in str(request.content_type)