happyz
/
fastapi
mirror of https://github.com/tiangolo/fastapi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Format proposed code

This commit is contained in:
Daniyar Yeralin 2020-08-12 14:40:38 -04:00
parent e8c83f100e
commit ec624a27be
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
fastapi/dependencies/utils.py
View File

@ -34,6 +34,7 @@ from pydantic.error_wrappers import ErrorWrapper
from pydantic.errors import MissingError from pydantic.errors import MissingError
from pydantic.fields import ( from pydantic.fields import (
SHAPE_LIST, SHAPE_LIST,
SHAPE_MAPPING,
SHAPE_SEQUENCE, SHAPE_SEQUENCE,
SHAPE_SET, SHAPE_SET,
SHAPE_SINGLETON, SHAPE_SINGLETON,
@ -41,7 +42,7 @@ from pydantic.fields import (
SHAPE_TUPLE_ELLIPSIS, SHAPE_TUPLE_ELLIPSIS,
FieldInfo, FieldInfo,
ModelField, ModelField,
Required, SHAPE_MAPPING, Required,
) )
from pydantic.schema import get_annotation_from_field_info from pydantic.schema import get_annotation_from_field_info
from pydantic.typing import ForwardRef, evaluate_forwardref from pydantic.typing import ForwardRef, evaluate_forwardref
@ -69,13 +70,9 @@ sequence_shape_to_type = {
SHAPE_TUPLE_ELLIPSIS: list, SHAPE_TUPLE_ELLIPSIS: list,
} }
mapping_shapes = { mapping_shapes = {SHAPE_MAPPING}
SHAPE_MAPPING mapping_types = dict
} mapping_shapes_to_type = {SHAPE_MAPPING: dict}
mapping_types = (dict)
mapping_shapes_to_type = {
SHAPE_MAPPING: dict
}
multipart_not_installed_error = ( multipart_not_installed_error = (
'Form data requires "python-multipart" to be installed. \n' 'Form data requires "python-multipart" to be installed. \n'
@ -343,10 +340,10 @@ def get_dependant(
add_param_to_fields(field=param_field, dependant=dependant) add_param_to_fields(field=param_field, dependant=dependant)
elif is_scalar_field(field=param_field): elif is_scalar_field(field=param_field):
add_param_to_fields(field=param_field, dependant=dependant) add_param_to_fields(field=param_field, dependant=dependant)
elif isinstance( elif isinstance(param.default, (params.Query, params.Header)) and (
param.default, (params.Query, params.Header) is_scalar_sequence_field(param_field)
) and (is_scalar_sequence_field(param_field) or is_scalar_mapping_field(param_field)
or is_scalar_mapping_field(param_field)): ):
add_param_to_fields(field=param_field, dependant=dependant) add_param_to_fields(field=param_field, dependant=dependant)
else: else:
field_info = param_field.field_info field_info = param_field.field_info

2
tests/main.py
View File

@ -1,5 +1,5 @@
import http import http
from typing import Optional, Dict from typing import Dict, Optional
from fastapi import FastAPI, Path, Query from fastapi import FastAPI, Path, Query

7
tests/test_query.py
View File

@ -53,8 +53,11 @@ response_not_valid_int = {
("/query/param-required/int", 422, response_missing), ("/query/param-required/int", 422, response_missing),
("/query/param-required/int?query=50", 200, "foo bar 50"), ("/query/param-required/int?query=50", 200, "foo bar 50"),
("/query/param-required/int?query=foo", 422, response_not_valid_int), ("/query/param-required/int?query=foo", 422, response_not_valid_int),
("/query/params?first-query=1&second-query=2", 200, "foo bar {'first-query': 1, " (
"'second-query': 2}") "/query/params?first-query=1&second-query=2",
200,
"foo bar {'first-query': 1, " "'second-query': 2}",
),
], ],
) )
def test_get_path(path, expected_status, expected_response): def test_get_path(path, expected_status, expected_response):