From c431e1af02a72240cd98edd79ee6e4469c1f1197 Mon Sep 17 00:00:00 2001
From: Brad Bishop <bradleyb@fuzziesquirrel.com>
Date: Mon, 10 Jul 2017 16:44:51 -0400
Subject: Revert "rest_dbus: run JSON response format plugin conditionally"

This reverts commit 1444fd8c9e9b0807b4f3682236bec7cb3eedeebf.

No longer needed after 944cd04.

Change-Id: I8b19d6506e8ffb6c51b145e8306498621dd53be0
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
---
 module/obmc/wsgi/apps/rest_dbus.py | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

(limited to 'module/obmc/wsgi')

diff --git a/module/obmc/wsgi/apps/rest_dbus.py b/module/obmc/wsgi/apps/rest_dbus.py
index 8cbbabc..ab02705 100644
--- a/module/obmc/wsgi/apps/rest_dbus.py
+++ b/module/obmc/wsgi/apps/rest_dbus.py
@@ -234,11 +234,10 @@ class RouteHandler(object):
 class DirectoryHandler(RouteHandler):
     verbs = 'GET'
     rules = '<path:path>/'
-    content_type = 'application/json'
 
     def __init__(self, app, bus):
         super(DirectoryHandler, self).__init__(
-            app, bus, self.verbs, self.rules, self.content_type)
+            app, bus, self.verbs, self.rules)
 
     def find(self, path='/'):
         return self.try_mapper_call(
@@ -254,11 +253,10 @@ class DirectoryHandler(RouteHandler):
 class ListNamesHandler(RouteHandler):
     verbs = 'GET'
     rules = ['/list', '<path:path>/list']
-    content_type = 'application/json'
 
     def __init__(self, app, bus):
         super(ListNamesHandler, self).__init__(
-            app, bus, self.verbs, self.rules, self.content_type)
+            app, bus, self.verbs, self.rules)
 
     def find(self, path='/'):
         return self.try_mapper_call(
@@ -274,11 +272,10 @@ class ListNamesHandler(RouteHandler):
 class ListHandler(RouteHandler):
     verbs = 'GET'
     rules = ['/enumerate', '<path:path>/enumerate']
-    content_type = 'application/json'
 
     def __init__(self, app, bus):
         super(ListHandler, self).__init__(
-            app, bus, self.verbs, self.rules, self.content_type)
+            app, bus, self.verbs, self.rules)
 
     def find(self, path='/'):
         return self.try_mapper_call(
@@ -925,7 +922,6 @@ class JsonApiResponsePlugin(object):
     ''' Emits responses in the OpenBMC json api format. '''
     name = 'json_api_response'
     api = 2
-    json_type = "application/json"
 
     @staticmethod
     def has_body():
-- 
cgit v1.2.1