x/wsme
Code Issues Proposed changes

Support override of response format via request.dataformat

Browse Source
This commit is contained in:
Endre Karlson 2013-03-27 00:13:16 +00:00
parent 2a1e50e6ef
commit 3944c29c96
1 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
wsmeext/flask.py
View File

@ -4,6 +4,8 @@ import functools
import logging
import sys
import mimetypes
import wsme
import wsme.api
import wsme.rest.json
@ -15,6 +17,25 @@ import flask
log = logging.getLogger(__name__)
def get_data_format():
dataformat = None
if 'Accept' in flask.request.headers:
if 'application/json' in flask.request.headers['Accept']:
dataformat = wsme.rest.json
elif 'text/xml' in flask.request.headers['Accept']:
dataformat = wsme.rest.xml
# Look for the wanted data format in the request.
if hasattr(flask.request, 'dataformat'):
mimetypes.guess_type(flask.request)
if dataformat is None:
log.info('''Could not determine what format is wanted by the
caller, falling back to json''')
dataformat = wsme.rest.json
return dataformat
def signature(*args, **kw):
sig = wsme.signature(*args, **kw)
@ -32,16 +53,8 @@ def signature(*args, **kw):
flask.request.mimetype
)
dataformat = None
if 'Accept' in flask.request.headers:
if 'application/json' in flask.request.headers['Accept']:
dataformat = wsme.rest.json
elif 'text/xml' in flask.request.headers['Accept']:
dataformat = wsme.rest.xml
if dataformat is None:
log.info('''Could not determine what format is wanted by the
caller, falling back to json''')
dataformat = wsme.rest.json
dataformat = get_data_format()
try:
status_code = None
result = f(*args, **kwargs)