Browse Source

add is_scaler_mapping back

pull/9837/head
JONEMI19 3 years ago
parent
commit
405fe23735
  1. 3
      .gitignore
  2. 2
      .pre-commit-config.yaml
  3. 12
      fastapi/_compat.py
  4. 2
      fastapi/dependencies/utils.py

3
.gitignore

@ -25,3 +25,6 @@ archive.zip
*~ *~
.*.sw? .*.sw?
.cache .cache
main.py
.devcontainer

2
.pre-commit-config.yaml

@ -1,7 +1,7 @@
# See https://pre-commit.com for more information # See https://pre-commit.com for more information
# See https://pre-commit.com/hooks.html for more hooks # See https://pre-commit.com/hooks.html for more hooks
default_language_version: default_language_version:
python: python3.10 python: python3.11
repos: repos:
- repo: https://github.com/pre-commit/pre-commit-hooks - repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.4.0 rev: v4.4.0

12
fastapi/_compat.py

@ -228,6 +228,12 @@ if PYDANTIC_V2:
def is_scalar_sequence_field(field: ModelField) -> bool: def is_scalar_sequence_field(field: ModelField) -> bool:
return field_annotation_is_scalar_sequence(field.field_info.annotation) return field_annotation_is_scalar_sequence(field.field_info.annotation)
def is_scalar_sequence_mapping_field(field: ModelField) -> bool:
return field_annotation_is_scalar_sequence(field.field_info.annotation)
def is_scalar_mapping_field(field: ModelField) -> bool:
return field_annotation_is_scalar_sequence(field.field_info.annotation)
def is_bytes_field(field: ModelField) -> bool: def is_bytes_field(field: ModelField) -> bool:
return is_bytes_or_nonable_bytes_annotation(field.type_) return is_bytes_or_nonable_bytes_annotation(field.type_)
@ -468,6 +474,12 @@ else:
def is_scalar_sequence_field(field: ModelField) -> bool: def is_scalar_sequence_field(field: ModelField) -> bool:
return is_pv1_scalar_sequence_field(field) return is_pv1_scalar_sequence_field(field)
def is_scalar_sequence_mapping_field(field: ModelField) -> bool:
return is_pv1_scalar_sequence_field(field)
def is_scalar_mapping_field(field: ModelField) -> bool:
return is_pv1_scalar_sequence_field(field)
def is_bytes_field(field: ModelField) -> bool: def is_bytes_field(field: ModelField) -> bool:
return lenient_issubclass(field.type_, bytes) return lenient_issubclass(field.type_, bytes)

2
fastapi/dependencies/utils.py

@ -37,6 +37,8 @@ from fastapi._compat import (
is_bytes_sequence_field, is_bytes_sequence_field,
is_scalar_field, is_scalar_field,
is_scalar_sequence_field, is_scalar_sequence_field,
is_scalar_mapping_field,
is_scalar_sequence_mapping_field,
is_sequence_field, is_sequence_field,
is_uploadfile_or_nonable_uploadfile_annotation, is_uploadfile_or_nonable_uploadfile_annotation,
is_uploadfile_sequence_annotation, is_uploadfile_sequence_annotation,

Loading…
Cancel
Save