summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad Bishop <bradleyb@fuzziesquirrel.com>2017-07-10 16:46:01 -0400
committerBrad Bishop <bradleyb@fuzziesquirrel.com>2017-07-11 01:44:43 +0000
commit529029b544aaf30b614c09dd5bfc17c1048edf3d (patch)
treeb6b47af06e9d2a205229b202194b8c26f7b5f1e1
parentc431e1af02a72240cd98edd79ee6e4469c1f1197 (diff)
downloadphosphor-rest-server-529029b544aaf30b614c09dd5bfc17c1048edf3d.tar.gz
phosphor-rest-server-529029b544aaf30b614c09dd5bfc17c1048edf3d.zip
Revert "Set content-type to routes that had none set"
This reverts commit 0dc67226dd38d5e603c9abc9f443809010ae85ee. No longer needed after 944cd04. Resolves: openbmc/openbmc#1932 Change-Id: I0f0a3fe2462cfd287ea7d7692fa47de685d595ea Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
-rw-r--r--module/obmc/wsgi/apps/rest_dbus.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/module/obmc/wsgi/apps/rest_dbus.py b/module/obmc/wsgi/apps/rest_dbus.py
index ab02705..41538bc 100644
--- a/module/obmc/wsgi/apps/rest_dbus.py
+++ b/module/obmc/wsgi/apps/rest_dbus.py
@@ -440,11 +440,10 @@ class PropertyHandler(RouteHandler):
class SchemaHandler(RouteHandler):
verbs = ['GET']
rules = '<path:path>/schema'
- content_type = 'application/json'
def __init__(self, app, bus):
super(SchemaHandler, 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(
@@ -471,12 +470,11 @@ class SchemaHandler(RouteHandler):
class InstanceHandler(RouteHandler):
verbs = ['GET', 'PUT', 'DELETE']
rules = '<path:path>'
- content_type = 'application/json'
request_type = dict
def __init__(self, app, bus):
super(InstanceHandler, self).__init__(
- app, bus, self.verbs, self.rules, self.content_type)
+ app, bus, self.verbs, self.rules)
def find(self, path, callback=None):
return {path: self.try_mapper_call(
OpenPOWER on IntegriCloud