Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

tornado, fix post json error using request body #147

Open
wants to merge 12 commits into
base: master
Choose a base branch
from
19 changes: 13 additions & 6 deletions swagger_py_codegen/templates/tornado/validators.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class ValidatorAdaptor(object):
if obj is None or not obj:
return None
if six.PY3:
if isinstance(obj, str):
if isinstance(obj, str) or isinstance(obj, bytes):
obj = MultiDict(json.loads(obj))
else:
if isinstance(obj, (str, unicode, basestring)):
Expand All @@ -40,20 +40,27 @@ class ValidatorAdaptor(object):
obj = MultiDict(six.iteritems(obj))
result = dict()

def convert_string_if_bytes(value):
return bytes.decode(value) if isinstance(value, bytes) else value

convert_funs = {
'integer': lambda v: self.validate_number(int, v[0]),
'boolean': lambda v: v[0].lower() not in ['n', 'no', 'false', '', '0'],
'boolean': lambda v: convert_string_if_bytes(v[0]).lower() not in ['n', 'no', 'false', '', '0'],
'null': lambda v: None,
'number': lambda v: self.validate_number(float, v[0]),
'string': lambda v: v[0]
'string': lambda v: convert_string_if_bytes(v[0])
}

def convert_array(type_, v):
func = convert_funs.get(type_, lambda v: v[0])
return [func([i]) for i in v]

for k, values in obj.lists():
prop = self.validator.schema['properties'].get(k, {})
schema = self.validator.schema
if '$ref' in schema:
_, schema = resolver.resolve(schema['$ref'])

prop = schema['properties'].get(k, {})
type_ = prop.get('type')
fun = convert_funs.get(type_, lambda v: v[0])
if type_ == 'array':
Expand Down Expand Up @@ -116,8 +123,8 @@ def response_filter(obj):
method = request.method
if method == 'HEAD':
method = 'GET'
headers = None
status = None
headers = {}
status = 200
if isinstance(resp, tuple):
resp, status, headers = unpack(resp)
filter = filters.get((endpoint, method), None)
Expand Down